Mercurial > hg
annotate tests/test-obsolete.t @ 31741:728d37353e1e
run-tests: auto-replace 'TXNID' output
Hooks related to the transaction are aware of the transaction id. By definition
this txn-id is unique and different for each transaction. As a result it can
never be predicted in test and always needs matching. As a result, touching any
like with this data is annoying. We solve the problem once and for all by
installing an automatic replacement. In test, this will now show as:
TXNID=TXN:$ID$
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 30 Mar 2017 17:29:03 +0200 |
parents | cda83a1bfb3a |
children | 3546a771e376 |
rev | line source |
---|---|
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
1 $ cat >> $HGRCPATH << EOF |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
2 > [phases] |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
3 > # public changeset are not obsolete |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
4 > publish=false |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
5 > [ui] |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
6 > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(troubles, ' {troubles}')}) [{tags} {bookmarks}] {desc|firstline}\n" |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
7 > EOF |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
8 $ mkcommit() { |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
9 > echo "$1" > "$1" |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
10 > hg add "$1" |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
11 > hg ci -m "add $1" |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
12 > } |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
13 $ getid() { |
24162
758dd85b6ad6
test-obsolete: use 'log -T {node}' instead of 'id --debug -i' to lookup hash
Matt Harbison <matt_harbison@yahoo.com>
parents:
24136
diff
changeset
|
14 > hg log -T "{node}\n" --hidden -r "desc('$1')" |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
15 > } |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
16 |
17252
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
17 $ cat > debugkeys.py <<EOF |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
18 > def reposetup(ui, repo): |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
19 > class debugkeysrepo(repo.__class__): |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
20 > def listkeys(self, namespace): |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
21 > ui.write('listkeys %s\n' % (namespace,)) |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
22 > return super(debugkeysrepo, self).listkeys(namespace) |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
23 > |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
24 > if repo.local(): |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
25 > repo.__class__ = debugkeysrepo |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
26 > EOF |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
27 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
28 $ hg init tmpa |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
29 $ cd tmpa |
17296
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
30 $ mkcommit kill_me |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
31 |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
32 Checking that the feature is properly disabled |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
33 |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
22950
bb8278b289ee
obsolete: add readonly flag to obstore constructor
Durham Goode <durham@fb.com>
parents:
22948
diff
changeset
|
35 abort: creating obsolete markers is not enabled on this repo |
17296
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
36 [255] |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
37 |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
38 Enabling it |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
39 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
40 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
41 > [experimental] |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
42 > evolution=createmarkers,exchange |
17296
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
43 > EOF |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
44 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
45 Killing a single changeset without replacement |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
46 |
17292
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
47 $ hg debugobsolete 0 |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
48 abort: changeset references must be full hexadecimal node identifiers |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
49 [255] |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
50 $ hg debugobsolete '00' |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
51 abort: changeset references must be full hexadecimal node identifiers |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
52 [255] |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
53 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
17074
178a2e85d426
debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents:
17071
diff
changeset
|
54 $ hg debugobsolete |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
55 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} |
18464
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
56 |
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
57 (test that mercurial is not confused) |
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
58 |
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
59 $ hg up null --quiet # having 0 as parent prevents it to be hidden |
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
60 $ hg tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
61 -1:000000000000 (public) [tip ] |
18464
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
62 $ hg up --hidden tip --quiet |
22177
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
63 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
64 Killing a single changeset with itself should fail |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
65 (simple local safeguard) |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
66 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
67 $ hg debugobsolete `getid kill_me` `getid kill_me` |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
68 abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
69 [255] |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
70 |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
71 $ cd .. |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
72 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
73 Killing a single changeset with replacement |
22948
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
74 (and testing the format option) |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
75 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
76 $ hg init tmpb |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
77 $ cd tmpb |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
78 $ mkcommit a |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
79 $ mkcommit b |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
80 $ mkcommit original_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
81 $ hg up "desc('b')" |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
83 $ mkcommit new_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
84 created new head |
17390
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
85 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
86 $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
17390
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
87 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
88 2:245bde4270cd add original_c |
21033
254f55b64e31
debugrevlog: use unfiltered view for changelog
Matt Mackall <mpm@selenic.com>
parents:
20807
diff
changeset
|
89 $ hg debugrevlog -cd |
22311
5038dee5bdd6
debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents:
22274
diff
changeset
|
90 # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen |
5038dee5bdd6
debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents:
22274
diff
changeset
|
91 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 |
5038dee5bdd6
debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents:
22274
diff
changeset
|
92 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 |
23285
6cc1f388ac80
revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents:
23094
diff
changeset
|
93 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 |
6cc1f388ac80
revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents:
23094
diff
changeset
|
94 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 |
17074
178a2e85d426
debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents:
17071
diff
changeset
|
95 $ hg debugobsolete |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
96 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
97 |
22948
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
98 (check for version number of the obsstore) |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
99 |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
100 $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
101 \x00 (no-eol) (esc) |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
102 |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
103 do it again (it read the obsstore before adding new changeset) |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
104 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
105 $ hg up '.^' |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
106 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
107 $ mkcommit new_2_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
108 created new head |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
109 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
17074
178a2e85d426
debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents:
17071
diff
changeset
|
110 $ hg debugobsolete |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
111 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
112 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
113 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
114 Register two markers with a missing node |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
115 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
116 $ hg up '.^' |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
117 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
118 $ mkcommit new_3_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
119 created new head |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
120 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
121 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
17074
178a2e85d426
debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents:
17071
diff
changeset
|
122 $ hg debugobsolete |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
123 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
124 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
125 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
126 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
127 |
28613
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
128 Test the --index option of debugobsolete command |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
129 $ hg debugobsolete --index |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
130 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
131 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
132 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
133 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
134 |
17774
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
135 Refuse pathological nullid successors |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
136 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
137 transaction abort! |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
138 rollback completed |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
139 abort: bad obsolescence marker detected: invalid successors nullid |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
140 [255] |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
141 |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
142 Check that graphlog detect that a changeset is obsolete: |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
143 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
144 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
145 @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
146 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
147 o 1:7c3bad9141dc (draft) [ ] add b |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
148 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
149 o 0:1f0dee641bb7 (draft) [ ] add a |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
150 |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
151 |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
152 check that heads does not report them |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
153 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
154 $ hg heads |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
155 5:5601fb93a350 (draft) [tip ] add new_3_c |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
156 $ hg heads --hidden |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
157 5:5601fb93a350 (draft) [tip ] add new_3_c |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
158 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
159 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
160 2:245bde4270cd (draft *obsolete*) [ ] add original_c |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
161 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
162 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
163 check that summary does not report them |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
164 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
165 $ hg init ../sink |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
166 $ echo '[paths]' >> .hg/hgrc |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
167 $ echo 'default=../sink' >> .hg/hgrc |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
168 $ hg summary --remote |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
169 parent: 5:5601fb93a350 tip |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
170 add new_3_c |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
171 branch: default |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
172 commit: (clean) |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
173 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25351
diff
changeset
|
174 phases: 3 draft |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
175 remote: 3 outgoing |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
176 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
177 $ hg summary --remote --hidden |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
178 parent: 5:5601fb93a350 tip |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
179 add new_3_c |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
180 branch: default |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
181 commit: (clean) |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
182 update: 3 new changesets, 4 branch heads (merge) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25351
diff
changeset
|
183 phases: 6 draft |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
184 remote: 3 outgoing |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
185 |
18423
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
186 check that various commands work well with filtering |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
187 |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
188 $ hg tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
189 5:5601fb93a350 (draft) [tip ] add new_3_c |
18423
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
190 $ hg log -r 6 |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
191 abort: unknown revision '6'! |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
192 [255] |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
193 $ hg log -r 4 |
23046
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
194 abort: hidden revision '4'! |
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
195 (use --hidden to access hidden revisions) |
18423
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
196 [255] |
23062
ba89f7b542c9
revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
Yuya Nishihara <yuya@tcha.org>
parents:
23046
diff
changeset
|
197 $ hg debugrevspec 'rev(6)' |
ba89f7b542c9
revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
Yuya Nishihara <yuya@tcha.org>
parents:
23046
diff
changeset
|
198 $ hg debugrevspec 'rev(4)' |
24204
d2de20e1451f
revset: extend fullreposet to make "null" revision magically appears in set
Yuya Nishihara <yuya@tcha.org>
parents:
24162
diff
changeset
|
199 $ hg debugrevspec 'null' |
d2de20e1451f
revset: extend fullreposet to make "null" revision magically appears in set
Yuya Nishihara <yuya@tcha.org>
parents:
24162
diff
changeset
|
200 -1 |
18423
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
201 |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
202 Check that public changeset are not accounted as obsolete: |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
203 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18104
diff
changeset
|
204 $ hg --hidden phase --public 2 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
205 $ hg log -G |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
206 @ 5:5601fb93a350 (draft bumped) [tip ] add new_3_c |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
207 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
208 | o 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
209 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
210 o 1:7c3bad9141dc (public) [ ] add b |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
211 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
212 o 0:1f0dee641bb7 (public) [ ] add a |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
213 |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
214 |
17829
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
215 And that bumped changeset are detected |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
216 -------------------------------------- |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
217 |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
218 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
219 note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
220 the public changeset |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
221 |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
222 $ hg log --hidden -r 'bumped()' |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
223 5:5601fb93a350 (draft bumped) [tip ] add new_3_c |
17829
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
224 |
17834
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
225 And that we can't push bumped changeset |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
226 |
18085
4c53f015564f
test: fix truncated comment in test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18015
diff
changeset
|
227 $ hg push ../tmpa -r 0 --force #(make repo related) |
18015
42f56a0418b3
clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17834
diff
changeset
|
228 pushing to ../tmpa |
42f56a0418b3
clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17834
diff
changeset
|
229 searching for changes |
18104
a2cebd3e4daa
clfilter: use filtering in `visibleheads`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18085
diff
changeset
|
230 warning: repository is unrelated |
18015
42f56a0418b3
clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17834
diff
changeset
|
231 adding changesets |
42f56a0418b3
clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17834
diff
changeset
|
232 adding manifests |
42f56a0418b3
clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17834
diff
changeset
|
233 adding file changes |
42f56a0418b3
clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17834
diff
changeset
|
234 added 1 changesets with 1 changes to 1 files (+1 heads) |
17834
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
235 $ hg push ../tmpa |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
236 pushing to ../tmpa |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
237 searching for changes |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
238 abort: push includes bumped changeset: 5601fb93a350! |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
239 [255] |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
240 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
241 Fixing "bumped" situation |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
242 We need to create a clone of 5 and add a special marker with a flag |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
243 |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
244 $ hg summary |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
245 parent: 5:5601fb93a350 tip (bumped) |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
246 add new_3_c |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
247 branch: default |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
248 commit: (clean) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
249 update: 1 new changesets, 2 branch heads (merge) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
250 phases: 1 draft |
27722
edd2615ad226
summary: print unstable, bumped and divergent as unconditionally plural
Matt Harbison <matt_harbison@yahoo.com>
parents:
27385
diff
changeset
|
251 bumped: 1 changesets |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
252 $ hg up '5^' |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
253 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
254 $ hg revert -ar 5 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
255 adding new_3_c |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
256 $ hg ci -m 'add n3w_3_c' |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
257 created new head |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
258 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
259 $ hg log -r 'bumped()' |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
260 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
261 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
262 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
263 | o 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
264 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
265 o 1:7c3bad9141dc (public) [ ] add b |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
266 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
267 o 0:1f0dee641bb7 (public) [ ] add a |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
268 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
269 |
24681
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
270 $ cd .. |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
271 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
272 Revision 0 is hidden |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
273 -------------------- |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
274 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
275 $ hg init rev0hidden |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
276 $ cd rev0hidden |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
277 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
278 $ mkcommit kill0 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
279 $ hg up -q null |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
280 $ hg debugobsolete `getid kill0` |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
281 $ mkcommit a |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
282 $ mkcommit b |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
283 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
284 Should pick the first visible revision as "repo" node |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
285 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
286 $ hg archive ../archive-null |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
287 $ cat ../archive-null/.hg_archival.txt |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
288 repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
289 node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
290 branch: default |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
291 latesttag: null |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
292 latesttagdistance: 2 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
293 changessincelatesttag: 2 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
294 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
295 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
296 $ cd .. |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
297 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
298 Exchange Test |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
299 ============================ |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
300 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
301 Destination repo does not have any data |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
302 --------------------------------------- |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
303 |
18493
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
304 Simple incoming test |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
305 |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
306 $ hg init tmpc |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
307 $ cd tmpc |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
308 $ hg incoming ../tmpb |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
309 comparing with ../tmpb |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
310 0:1f0dee641bb7 (public) [ ] add a |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
311 1:7c3bad9141dc (public) [ ] add b |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
312 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
313 6:6f9641995072 (draft) [tip ] add n3w_3_c |
18493
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
314 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
315 Try to pull markers |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
316 (extinct changeset are excluded but marker are pushed) |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
317 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
318 $ hg pull ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
319 pulling from ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
320 requesting all changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
321 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
322 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
323 adding file changes |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
324 added 4 changesets with 4 changes to 4 files (+1 heads) |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
325 5 new obsolescence markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
326 (run 'hg heads' to see heads, 'hg merge' to merge) |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
327 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
328 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
329 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
330 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
331 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
332 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
17126
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
333 |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
334 Rollback//Transaction support |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
335 |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
336 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
337 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
338 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
339 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
340 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
341 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
342 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
343 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} |
17126
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
344 $ hg rollback -n |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
345 repository tip rolled back to revision 3 (undo debugobsolete) |
17126
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
346 $ hg rollback |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
347 repository tip rolled back to revision 3 (undo debugobsolete) |
17126
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
348 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
349 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
350 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
351 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
352 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
353 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
354 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
355 $ cd .. |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
356 |
18492
45445187d286
test: minor documentation fix
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18464
diff
changeset
|
357 Try to push markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
358 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
359 $ hg init tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
360 $ hg -R tmpb push tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
361 pushing to tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
362 searching for changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
363 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
364 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
365 adding file changes |
17169
c18ecebed3f1
push: refuse to push obsolete changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17126
diff
changeset
|
366 added 4 changesets with 4 changes to 4 files (+1 heads) |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
367 5 new obsolescence markers |
22349
9d1f3896f39c
test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22348
diff
changeset
|
368 $ hg -R tmpd debugobsolete | sort |
9d1f3896f39c
test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22348
diff
changeset
|
369 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
370 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
22349
9d1f3896f39c
test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22348
diff
changeset
|
371 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
9d1f3896f39c
test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22348
diff
changeset
|
372 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
373 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
374 |
17252
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
375 Check obsolete keys are exchanged only if source has an obsolete store |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
376 |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
377 $ hg init empty |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
378 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
379 pushing to tmpd |
22019
9fcf772f15ff
push: perform phases discovery before the push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21978
diff
changeset
|
380 listkeys phases |
22239
0688010ee38f
push: move bookmark discovery with other discovery steps
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22220
diff
changeset
|
381 listkeys bookmarks |
17252
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
382 no changes found |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
383 listkeys phases |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
384 [1] |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
385 |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
386 clone support |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
387 (markers are copied and extinct changesets are included to allow hardlinks) |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
388 |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
389 $ hg clone tmpb clone-dest |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
390 updating to branch default |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
391 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
392 $ hg -R clone-dest log -G --hidden |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
393 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
394 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
395 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
396 |/ |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
397 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
398 |/ |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
399 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
400 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
401 | o 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
402 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
403 o 1:7c3bad9141dc (public) [ ] add b |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
404 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
405 o 0:1f0dee641bb7 (public) [ ] add a |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
406 |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
407 $ hg -R clone-dest debugobsolete |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
408 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
409 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
410 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
411 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
412 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
413 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
414 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
415 Destination repo have existing data |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
416 --------------------------------------- |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
417 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
418 On pull |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
419 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
420 $ hg init tmpe |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
421 $ cd tmpe |
22348
44092e6d5e13
test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22311
diff
changeset
|
422 $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
423 $ hg pull ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
424 pulling from ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
425 requesting all changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
426 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
427 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
428 adding file changes |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
429 added 4 changesets with 4 changes to 4 files (+1 heads) |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
430 5 new obsolescence markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
431 (run 'hg heads' to see heads, 'hg merge' to merge) |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
432 $ hg debugobsolete |
22348
44092e6d5e13
test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22311
diff
changeset
|
433 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
434 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
435 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
436 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
437 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
438 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
439 |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
440 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
441 On push |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
442 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
443 $ hg push ../tmpc |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
444 pushing to ../tmpc |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
445 searching for changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
446 no changes found |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
447 1 new obsolescence markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
448 [1] |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
449 $ hg -R ../tmpc debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
450 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
451 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
452 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
453 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
454 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
22348
44092e6d5e13
test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22311
diff
changeset
|
455 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
456 |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
457 detect outgoing obsolete and unstable |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
458 --------------------------------------- |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
459 |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
460 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
461 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
462 o 3:6f9641995072 (draft) [tip ] add n3w_3_c |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
463 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
464 | o 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
465 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
466 o 1:7c3bad9141dc (public) [ ] add b |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
467 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
468 o 0:1f0dee641bb7 (public) [ ] add a |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
469 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
470 $ hg up 'desc("n3w_3_c")' |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
471 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
472 $ mkcommit original_d |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
473 $ mkcommit original_e |
22272
406181ee335f
debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22239
diff
changeset
|
474 $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
406181ee335f
debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22239
diff
changeset
|
475 $ hg debugobsolete | grep `getid original_d` |
406181ee335f
debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22239
diff
changeset
|
476 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
477 $ hg log -r 'obsolete()' |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
478 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
479 $ hg summary |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
480 parent: 5:cda648ca50f5 tip (unstable) |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
481 add original_e |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
482 branch: default |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
483 commit: (clean) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
484 update: 1 new changesets, 2 branch heads (merge) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
485 phases: 3 draft |
27722
edd2615ad226
summary: print unstable, bumped and divergent as unconditionally plural
Matt Harbison <matt_harbison@yahoo.com>
parents:
27385
diff
changeset
|
486 unstable: 1 changesets |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
487 $ hg log -G -r '::unstable()' |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
488 @ 5:cda648ca50f5 (draft unstable) [tip ] add original_e |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
489 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
490 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
491 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
492 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
493 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
494 o 1:7c3bad9141dc (public) [ ] add b |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
495 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
496 o 0:1f0dee641bb7 (public) [ ] add a |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
497 |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
498 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
499 refuse to push obsolete changeset |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
500 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
501 $ hg push ../tmpc/ -r 'desc("original_d")' |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
502 pushing to ../tmpc/ |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
503 searching for changes |
17833
0c1185f6ddd7
obsolete: simplify push abort message
push includes an xxx changeset: yyyyyyyyyy
parents:
17831
diff
changeset
|
504 abort: push includes obsolete changeset: 94b33453f93b! |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
505 [255] |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
506 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
507 refuse to push unstable changeset |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
508 |
17172
12fdaa30063a
push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17171
diff
changeset
|
509 $ hg push ../tmpc/ |
12fdaa30063a
push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17171
diff
changeset
|
510 pushing to ../tmpc/ |
12fdaa30063a
push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17171
diff
changeset
|
511 searching for changes |
17833
0c1185f6ddd7
obsolete: simplify push abort message
push includes an xxx changeset: yyyyyyyyyy
parents:
17831
diff
changeset
|
512 abort: push includes unstable changeset: cda648ca50f5! |
17172
12fdaa30063a
push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17171
diff
changeset
|
513 [255] |
17173
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
514 |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
515 Test that extinct changeset are properly detected |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
516 |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
517 $ hg log -r 'extinct()' |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
518 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
519 Don't try to push extinct changeset |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
520 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
521 $ hg init ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
522 $ hg out ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
523 comparing with ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
524 searching for changes |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
525 0:1f0dee641bb7 (public) [ ] add a |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
526 1:7c3bad9141dc (public) [ ] add b |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
527 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
528 3:6f9641995072 (draft) [ ] add n3w_3_c |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
529 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
530 5:cda648ca50f5 (draft unstable) [tip ] add original_e |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
531 $ hg push ../tmpf -f # -f because be push unstable too |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
532 pushing to ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
533 searching for changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
534 adding changesets |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
535 adding manifests |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
536 adding file changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
537 added 6 changesets with 6 changes to 6 files (+1 heads) |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
538 7 new obsolescence markers |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
539 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
540 no warning displayed |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
541 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
542 $ hg push ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
543 pushing to ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
544 searching for changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
545 no changes found |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
546 [1] |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
547 |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
548 Do not warn about new head when the new head is a successors of a remote one |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
549 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
550 $ hg log -G |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
551 @ 5:cda648ca50f5 (draft unstable) [tip ] add original_e |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
552 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
553 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
554 | |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
555 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
556 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
557 | o 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
558 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
559 o 1:7c3bad9141dc (public) [ ] add b |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
560 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
561 o 0:1f0dee641bb7 (public) [ ] add a |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
562 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
563 $ hg up -q 'desc(n3w_3_c)' |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
564 $ mkcommit obsolete_e |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
565 created new head |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
566 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` |
18493
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
567 $ hg outgoing ../tmpf # parasite hg outgoing testin |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
568 comparing with ../tmpf |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
569 searching for changes |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
570 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
571 $ hg push ../tmpf |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
572 pushing to ../tmpf |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
573 searching for changes |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
574 adding changesets |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
575 adding manifests |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
576 adding file changes |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
577 added 1 changesets with 1 changes to 1 files (+1 heads) |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
578 1 new obsolescence markers |
17297
6955d69a52a4
obsolete: warns if markers exist in a repo where the feature is not enabled
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17296
diff
changeset
|
579 |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
580 test relevance computation |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
581 --------------------------------------- |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
582 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
583 Checking simple case of "marker relevance". |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
584 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
585 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
586 Reminder of the repo situation |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
587 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
588 $ hg log --hidden --graph |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
589 @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
590 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
591 | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
592 | | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
593 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
594 |/ |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
595 o 3:6f9641995072 (draft) [ ] add n3w_3_c |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
596 | |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
597 | o 2:245bde4270cd (public) [ ] add original_c |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
598 |/ |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
599 o 1:7c3bad9141dc (public) [ ] add b |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
600 | |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
601 o 0:1f0dee641bb7 (public) [ ] add a |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
602 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
603 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
604 List of all markers |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
605 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
606 $ hg debugobsolete |
22348
44092e6d5e13
test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22311
diff
changeset
|
607 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
608 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
609 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
610 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
611 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
612 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
613 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
614 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
615 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
616 List of changesets with no chain |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
617 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
618 $ hg debugobsolete --hidden --rev ::2 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
619 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
620 List of changesets that are included on marker chain |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
621 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
622 $ hg debugobsolete --hidden --rev 6 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
623 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
624 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
625 List of changesets with a longer chain, (including a pruned children) |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
626 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
627 $ hg debugobsolete --hidden --rev 3 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
628 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
22348
44092e6d5e13
test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22311
diff
changeset
|
629 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
630 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
631 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
632 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
633 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
634 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
635 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
636 List of both |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
637 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
638 $ hg debugobsolete --hidden --rev 3::6 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
639 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
22348
44092e6d5e13
test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22311
diff
changeset
|
640 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
641 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
642 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
643 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
644 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
645 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
646 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
647 |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
648 List of all markers in JSON |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
649 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
650 $ hg debugobsolete -Tjson |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
651 [ |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
652 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
653 "date": [1339.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
654 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
655 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
656 "precnode": "1339133913391339133913391339133913391339", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
657 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
658 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
659 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
660 "date": [1339.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
661 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
662 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
663 "precnode": "1337133713371337133713371337133713371337", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
664 "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
665 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
666 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
667 "date": [121.0, 120], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
668 "flag": 12, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
669 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
670 "precnode": "245bde4270cd1072a27757984f9cda8ba26f08ca", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
671 "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
672 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
673 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
674 "date": [1338.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
675 "flag": 1, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
676 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
677 "precnode": "5601fb93a350734d935195fee37f4054c529ff39", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
678 "succnodes": ["6f96419950729f3671185b847352890f074f7557"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
679 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
680 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
681 "date": [1338.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
682 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
683 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
684 "precnode": "ca819180edb99ed25ceafb3e9584ac287e240b00", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
685 "succnodes": ["1337133713371337133713371337133713371337"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
686 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
687 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
688 "date": [1337.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
689 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
690 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
691 "precnode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
692 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
693 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
694 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
695 "date": [0.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
696 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
697 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
698 "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
699 "precnode": "94b33453f93bdb8d457ef9b770851a618bf413e1", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
700 "succnodes": [] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
701 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
702 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
703 "date": *, (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
704 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
705 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
706 "precnode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
707 "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
708 } |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
709 ] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
710 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
711 Template keywords |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
712 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
713 $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
714 3de5eca88c00 ????-??-?? (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
715 $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
716 user=test |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
717 $ hg debugobsolete -r6 -T '{metadata}\n' |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
718 'user': 'test' |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
719 $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
720 0 test |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
721 |
24733
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
722 Test the debug output for exchange |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
723 ---------------------------------- |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
724 |
29688
30c59bdd4f41
tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29657
diff
changeset
|
725 $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 |
24733
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
726 pulling from ../tmpb |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
727 searching for changes |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
728 no changes found |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
729 obsmarker-exchange: 346 bytes received |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
730 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
731 check hgweb does not explode |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
732 ==================================== |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
733 |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
734 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
735 adding changesets |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
736 adding manifests |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
737 adding file changes |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
738 added 62 changesets with 63 changes to 9 files (+60 heads) |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
739 (run 'hg heads .' to see heads, 'hg merge' to merge) |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
740 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
741 > do |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
742 > hg debugobsolete $node |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
743 > done |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
744 $ hg up tip |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
745 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
746 |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
747 #if serve |
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
748 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
749 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
750 $ cat hg.pid >> $DAEMON_PIDS |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
751 |
18426
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
752 check changelog view |
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
753 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
754 $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' |
18426
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
755 200 Script output follows |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
756 |
18428
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
757 check graph view |
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
758 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
759 $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' |
18428
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
760 200 Script output follows |
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
761 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
762 check filelog view |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
763 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
764 $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
765 200 Script output follows |
18522
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
766 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
767 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' |
18522
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
768 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
769 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
18532
a6088c05e43a
test-obsolete: now gets 404 for hidden change
Matt Mackall <mpm@selenic.com>
parents:
18522
diff
changeset
|
770 404 Not Found |
18522
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
771 [1] |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
772 |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
773 check that web.view config option: |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
774 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
775 $ killdaemons.py hg.pid |
18522
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
776 $ cat >> .hg/hgrc << EOF |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
777 > [web] |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
778 > view=all |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
779 > EOF |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
780 $ wait |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
781 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
782 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
18522
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
783 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
784 $ killdaemons.py hg.pid |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
785 |
17306
7d2967de2c04
obsolete: fix typos in comments introduced by 6955d69a52a4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17297
diff
changeset
|
786 Checking _enable=False warning if obsolete marker exists |
17297
6955d69a52a4
obsolete: warns if markers exist in a repo where the feature is not enabled
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17296
diff
changeset
|
787 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
788 $ echo '[experimental]' >> $HGRCPATH |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
789 $ echo "evolution=" >> $HGRCPATH |
17297
6955d69a52a4
obsolete: warns if markers exist in a repo where the feature is not enabled
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17296
diff
changeset
|
790 $ hg log -r tip |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
791 obsolete feature not enabled but 68 markers found! |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
792 68:c15e9edfca13 (draft) [tip ] add celestine |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
793 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
794 reenable for later test |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
795 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
796 $ echo '[experimental]' >> $HGRCPATH |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
797 $ echo "evolution=createmarkers,exchange" >> $HGRCPATH |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
798 |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
799 $ rm hg.pid access.log errors.log |
18506
ef60083b5536
tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents:
18493
diff
changeset
|
800 #endif |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
801 |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
802 Several troubles on the same changeset (create an unstable and bumped changeset) |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
803 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
804 $ hg debugobsolete `getid obsolete_e` |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
805 $ hg debugobsolete `getid original_c` `getid babar` |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
806 $ hg log --config ui.logtemplate= -r 'bumped() and unstable()' |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
807 changeset: 7:50c51b361e60 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
808 user: test |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
809 date: Thu Jan 01 00:00:00 1970 +0000 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
810 trouble: unstable, bumped |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
811 summary: add babar |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
812 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
813 |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
814 test the "obsolete" templatekw |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
815 |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
816 $ hg log -r 'obsolete()' |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
817 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
818 |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
819 test the "troubles" templatekw |
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
820 |
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
821 $ hg log -r 'bumped() and unstable()' |
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
822 7:50c51b361e60 (draft unstable bumped) [ ] add babar |
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
823 |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
824 test the default cmdline template |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
825 |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
826 $ hg log -T default -r 'bumped()' |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
827 changeset: 7:50c51b361e60 |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
828 user: test |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
829 date: Thu Jan 01 00:00:00 1970 +0000 |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
830 trouble: unstable, bumped |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
831 summary: add babar |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
832 |
31702
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
833 $ hg log -T default -r 'obsolete()' |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
834 changeset: 6:3de5eca88c00 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
835 parent: 3:6f9641995072 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
836 user: test |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
837 date: Thu Jan 01 00:00:00 1970 +0000 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
838 summary: add obsolete_e |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
839 |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
840 |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
841 test summary output |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
842 |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
843 $ hg up -r 'bumped() and unstable()' |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
844 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
845 $ hg summary |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
846 parent: 7:50c51b361e60 (unstable, bumped) |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
847 add babar |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
848 branch: default |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
849 commit: (clean) |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
850 update: 2 new changesets (update) |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
851 phases: 4 draft |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
852 unstable: 2 changesets |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
853 bumped: 1 changesets |
31703
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
854 $ hg up -r 'obsolete()' |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
855 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
856 $ hg summary |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
857 parent: 6:3de5eca88c00 (obsolete) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
858 add obsolete_e |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
859 branch: default |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
860 commit: (clean) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
861 update: 3 new changesets (update) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
862 phases: 4 draft |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
863 unstable: 2 changesets |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
864 bumped: 1 changesets |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
865 |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
866 Test incoming/outcoming with changesets obsoleted remotely, known locally |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
867 =============================================================================== |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
868 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
869 This test issue 3805 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
870 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
871 $ hg init repo-issue3805 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
872 $ cd repo-issue3805 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
873 $ echo "base" > base |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
874 $ hg ci -Am "base" |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
875 adding base |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
876 $ echo "foo" > foo |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
877 $ hg ci -Am "A" |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
878 adding foo |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
879 $ hg clone . ../other-issue3805 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
880 updating to branch default |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
881 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
882 $ echo "bar" >> foo |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
883 $ hg ci --amend |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
884 $ cd ../other-issue3805 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
885 $ hg log -G |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
886 @ 1:29f0c6921ddd (draft) [tip ] A |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
887 | |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
888 o 0:d20a80d4def3 (draft) [ ] base |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
889 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
890 $ hg log -G -R ../repo-issue3805 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
891 @ 3:323a9c3ddd91 (draft) [tip ] A |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
892 | |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
893 o 0:d20a80d4def3 (draft) [ ] base |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
894 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
895 $ hg incoming |
18679
f6f35d646cb5
tests: append glob to filename output when required (windows)
Simon Heimberg <simohe@besonet.ch>
parents:
18617
diff
changeset
|
896 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
897 searching for changes |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
898 3:323a9c3ddd91 (draft) [tip ] A |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
899 $ hg incoming --bundle ../issue3805.hg |
18679
f6f35d646cb5
tests: append glob to filename output when required (windows)
Simon Heimberg <simohe@besonet.ch>
parents:
18617
diff
changeset
|
900 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
901 searching for changes |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
902 3:323a9c3ddd91 (draft) [tip ] A |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
903 $ hg outgoing |
18679
f6f35d646cb5
tests: append glob to filename output when required (windows)
Simon Heimberg <simohe@besonet.ch>
parents:
18617
diff
changeset
|
904 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
905 searching for changes |
27319
b64b6fdc5c9b
discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27318
diff
changeset
|
906 1:29f0c6921ddd (draft) [tip ] A |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
907 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
908 #if serve |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
909 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
910 $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
911 $ cat hg.pid >> $DAEMON_PIDS |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
912 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
913 $ hg incoming http://localhost:$HGPORT |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
914 comparing with http://localhost:$HGPORT/ |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
915 searching for changes |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
916 2:323a9c3ddd91 (draft) [tip ] A |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
917 $ hg outgoing http://localhost:$HGPORT |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
918 comparing with http://localhost:$HGPORT/ |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
919 searching for changes |
27319
b64b6fdc5c9b
discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27318
diff
changeset
|
920 1:29f0c6921ddd (draft) [tip ] A |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
921 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
922 $ killdaemons.py |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
923 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
924 #endif |
18617
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
925 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
926 This test issue 3814 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
927 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
928 (nothing to push but locally hidden changeset) |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
929 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
930 $ cd .. |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
931 $ hg init repo-issue3814 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
932 $ cd repo-issue3805 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
933 $ hg push -r 323a9c3ddd91 ../repo-issue3814 |
18617
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
934 pushing to ../repo-issue3814 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
935 searching for changes |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
936 adding changesets |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
937 adding manifests |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
938 adding file changes |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
939 added 2 changesets with 2 changes to 2 files |
25351
97513f9d2e38
test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25297
diff
changeset
|
940 2 new obsolescence markers |
18617
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
941 $ hg out ../repo-issue3814 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
942 comparing with ../repo-issue3814 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
943 searching for changes |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
944 no changes found |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
945 [1] |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
946 |
20807
91d28bd0e04e
repoview: add non-global tags to candidate list for blocking hidden changesets
Sean Farley <sean.michael.farley@gmail.com>
parents:
20117
diff
changeset
|
947 Test that a local tag blocks a changeset from being hidden |
18617
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
948 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
949 $ hg tag -l visible -r 1 --hidden |
20807
91d28bd0e04e
repoview: add non-global tags to candidate list for blocking hidden changesets
Sean Farley <sean.michael.farley@gmail.com>
parents:
20117
diff
changeset
|
950 $ hg log -G |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
951 @ 3:323a9c3ddd91 (draft) [tip ] A |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
952 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
953 | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
954 |/ |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
955 o 0:d20a80d4def3 (draft) [ ] base |
20807
91d28bd0e04e
repoview: add non-global tags to candidate list for blocking hidden changesets
Sean Farley <sean.michael.farley@gmail.com>
parents:
20117
diff
changeset
|
956 |
21823
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
957 Test that removing a local tag does not cause some commands to fail |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
958 |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
959 $ hg tag -l -r tip tiptag |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
960 $ hg tags |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
961 tiptag 3:323a9c3ddd91 |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
962 tip 3:323a9c3ddd91 |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
963 visible 1:29f0c6921ddd |
21823
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
964 $ hg --config extensions.strip= strip -r tip --no-backup |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
965 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
966 $ hg tags |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
967 visible 1:29f0c6921ddd |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
968 tip 1:29f0c6921ddd |
24113
b08af8f0ac01
localrepo: don't reintroduce pruned tag entries when tagging
Matt Harbison <matt_harbison@yahoo.com>
parents:
23632
diff
changeset
|
969 |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
970 Test bundle overlay onto hidden revision |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
971 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
972 $ cd .. |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
973 $ hg init repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
974 $ cd repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
975 $ echo "A" > foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
976 $ hg ci -Am "A" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
977 adding foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
978 $ echo "B" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
979 $ hg ci -m "B" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
980 $ hg up 0 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
981 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
982 $ echo "C" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
983 $ hg ci -m "C" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
984 created new head |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
985 $ hg log -G |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
986 @ 2:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
987 | |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
988 | o 1:44526ebb0f98 (draft) [ ] B |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
989 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
990 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
991 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
992 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
993 $ hg clone -r1 . ../other-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
994 adding changesets |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
995 adding manifests |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
996 adding file changes |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
997 added 2 changesets with 2 changes to 1 files |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
998 updating to branch default |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
999 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1000 $ cd ../other-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1001 $ echo "B+" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1002 $ hg ci --amend -m "B+" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1003 $ hg log -G --hidden |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1004 @ 3:b7d587542d40 (draft) [tip ] B+ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1005 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
1006 | x 2:eb95e9297e18 (draft *obsolete*) [ ] temporary amend commit for 44526ebb0f98 |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1007 | | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
1008 | x 1:44526ebb0f98 (draft *obsolete*) [ ] B |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1009 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1010 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1011 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1012 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1013 $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1014 comparing with ../repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1015 searching for changes |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1016 1:44526ebb0f98 (draft) [ ] B |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1017 2:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1018 $ hg log -G -R ../bundleoverlay.hg |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1019 o 4:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1020 | |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1021 | @ 3:b7d587542d40 (draft) [ ] B+ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1022 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1023 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1024 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1025 |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1026 #if serve |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1027 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1028 Test issue 4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1029 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1030 $ cd .. |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1031 $ hg init repo-issue4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1032 $ cd repo-issue4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1033 $ echo "0" > foo |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1034 $ hg add foo |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1035 $ hg ci -m "content-0" |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1036 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1037 $ hg up null |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1038 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1039 $ echo "1" > bar |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1040 $ hg add bar |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1041 $ hg ci -m "content-1" |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1042 created new head |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1043 $ hg up 0 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1044 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1045 $ hg graft 1 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1046 grafting 1:1c9eddb02162 "content-1" (tip) |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1047 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1048 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1049 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1050 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1051 $ cat hg.pid >> $DAEMON_PIDS |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1052 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1053 $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1054 404 Not Found |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1055 [1] |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1056 $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1057 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1058 $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1059 200 Script output follows |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1060 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
1061 $ killdaemons.py |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1062 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1063 #endif |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1064 |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1065 Test heads computation on pending index changes with obsolescence markers |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1066 $ cd .. |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1067 $ cat >$TESTTMP/test_extension.py << EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1068 > from mercurial import cmdutil |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1069 > from mercurial.i18n import _ |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1070 > |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1071 > cmdtable = {} |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1072 > command = cmdutil.command(cmdtable) |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1073 > @command("amendtransient",[], _('hg amendtransient [rev]')) |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1074 > def amend(ui, repo, *pats, **opts): |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1075 > def commitfunc(ui, repo, message, match, opts): |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1076 > return repo.commit(message, repo['.'].user(), repo['.'].date(), match) |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1077 > opts['message'] = 'Test' |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1078 > opts['logfile'] = None |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1079 > cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts) |
28612
6fb1d3c936d2
tests: explicitly flush output streams
Jun Wu <quark@fb.com>
parents:
28286
diff
changeset
|
1080 > ui.write('%s\n' % repo.changelog.headrevs()) |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1081 > EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1082 $ cat >> $HGRCPATH << EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1083 > [extensions] |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1084 > testextension=$TESTTMP/test_extension.py |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1085 > EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1086 $ hg init repo-issue-nativerevs-pending-changes |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1087 $ cd repo-issue-nativerevs-pending-changes |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1088 $ mkcommit a |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1089 $ mkcommit b |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1090 $ hg up ".^" |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1091 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1092 $ echo aa > a |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1093 $ hg amendtransient |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1094 [1, 3] |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1095 |
27917
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1096 Check that corrupted hidden cache does not crash |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1097 |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1098 $ printf "" > .hg/cache/hidden |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1099 $ hg log -r . -T '{node}' --debug |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1100 corrupted hidden cache |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1101 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1102 $ hg log -r . -T '{node}' --debug |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1103 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1104 |
28172
f2004e4908f3
test-obsolete: conditionalize a test dependent on chmod
Matt Harbison <matt_harbison@yahoo.com>
parents:
27917
diff
changeset
|
1105 #if unix-permissions |
27917
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1106 Check that wrong hidden cache permission does not crash |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1107 |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1108 $ chmod 000 .hg/cache/hidden |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1109 $ hg log -r . -T '{node}' --debug |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1110 cannot read hidden cache |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1111 error writing hidden changesets cache |
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1112 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) |
28172
f2004e4908f3
test-obsolete: conditionalize a test dependent on chmod
Matt Harbison <matt_harbison@yahoo.com>
parents:
27917
diff
changeset
|
1113 #endif |
27917
97e0dc6d248c
repoview: fix corrupted hiddencache crash Mercurial (issue5042)
Laurent Charignon <lcharignon@fb.com>
parents:
27722
diff
changeset
|
1114 |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1115 Test cache consistency for the visible filter |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1116 1) We want to make sure that the cached filtered revs are invalidated when |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1117 bookmarks change |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1118 $ cd .. |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1119 $ cat >$TESTTMP/test_extension.py << EOF |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1120 > import weakref |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1121 > from mercurial import cmdutil, extensions, bookmarks, repoview |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1122 > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1123 > reporef = weakref.ref(bkmstoreinst._repo) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1124 > def trhook(tr): |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1125 > repo = reporef() |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1126 > hidden1 = repoview.computehidden(repo) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1127 > hidden = repoview.filterrevs(repo, 'visible') |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1128 > if sorted(hidden1) != sorted(hidden): |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1129 > print "cache inconsistency" |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1130 > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1131 > orig(bkmstoreinst, *args, **kwargs) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1132 > def extsetup(ui): |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1133 > extensions.wrapfunction(bookmarks.bmstore, 'recordchange', |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1134 > _bookmarkchanged) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1135 > EOF |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1136 |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1137 $ hg init repo-cache-inconsistency |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1138 $ cd repo-issue-nativerevs-pending-changes |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1139 $ mkcommit a |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1140 a already tracked! |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1141 $ mkcommit b |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1142 $ hg id |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1143 13bedc178fce tip |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1144 $ echo "hello" > b |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1145 $ hg commit --amend -m "message" |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1146 $ hg book bookb -r 13bedc178fce --hidden |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1147 $ hg log -r 13bedc178fce |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
1148 5:13bedc178fce (draft *obsolete*) [ bookb] add b |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1149 $ hg book -d bookb |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1150 $ hg log -r 13bedc178fce |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1151 abort: hidden revision '13bedc178fce'! |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1152 (use --hidden to access hidden revisions) |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1153 [255] |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1154 |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1155 Empty out the test extension, as it isn't compatible with later parts |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1156 of the test. |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1157 $ echo > $TESTTMP/test_extension.py |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1158 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1159 Test ability to pull changeset with locally applying obsolescence markers |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1160 (issue4945) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1161 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1162 $ cd .. |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1163 $ hg init issue4845 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1164 $ cd issue4845 |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1165 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1166 $ echo foo > f0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1167 $ hg add f0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1168 $ hg ci -m '0' |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1169 $ echo foo > f1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1170 $ hg add f1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1171 $ hg ci -m '1' |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1172 $ echo foo > f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1173 $ hg add f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1174 $ hg ci -m '2' |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1175 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1176 $ echo bar > f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1177 $ hg commit --amend --config experimetnal.evolution=createmarkers |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1178 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1179 @ 4:b0551702f918 (draft) [tip ] 2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1180 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1181 o 1:e016b03fd86f (draft) [ ] 1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1182 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1183 o 0:a78f55e5508c (draft) [ ] 0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1184 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1185 $ hg log -G --hidden |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1186 @ 4:b0551702f918 (draft) [tip ] 2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1187 | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
1188 | x 3:f27abbcc1f77 (draft *obsolete*) [ ] temporary amend commit for e008cf283490 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1189 | | |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
1190 | x 2:e008cf283490 (draft *obsolete*) [ ] 2 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1191 |/ |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1192 o 1:e016b03fd86f (draft) [ ] 1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1193 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1194 o 0:a78f55e5508c (draft) [ ] 0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1195 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1196 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1197 $ hg strip -r 1 --config extensions.strip= |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1198 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1199 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg (glob) |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1200 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1201 @ 0:a78f55e5508c (draft) [tip ] 0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1202 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1203 $ hg log -G --hidden |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1204 @ 0:a78f55e5508c (draft) [tip ] 0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1205 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1206 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1207 $ hg pull .hg/strip-backup/* |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1208 pulling from .hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1209 searching for changes |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1210 adding changesets |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1211 adding manifests |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1212 adding file changes |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1213 added 2 changesets with 2 changes to 2 files |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1214 (run 'hg update' to get a working copy) |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1215 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1216 o 2:b0551702f918 (draft) [tip ] 2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1217 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1218 o 1:e016b03fd86f (draft) [ ] 1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1219 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1220 @ 0:a78f55e5508c (draft) [ ] 0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1221 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1222 $ hg log -G --hidden |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1223 o 2:b0551702f918 (draft) [tip ] 2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1224 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1225 o 1:e016b03fd86f (draft) [ ] 1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1226 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1227 @ 0:a78f55e5508c (draft) [ ] 0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1228 |
28845
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1229 Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1230 only a subset of those are displayed (because of --rev option) |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1231 $ hg init doindexrev |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1232 $ cd doindexrev |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1233 $ echo a > a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1234 $ hg ci -Am a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1235 adding a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1236 $ hg ci --amend -m aa |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1237 $ echo b > b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1238 $ hg ci -Am b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1239 adding b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1240 $ hg ci --amend -m bb |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1241 $ echo c > c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1242 $ hg ci -Am c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1243 adding c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1244 $ hg ci --amend -m cc |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1245 $ echo d > d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1246 $ hg ci -Am d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1247 adding d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1248 $ hg ci --amend -m dd |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1249 $ hg debugobsolete --index --rev "3+7" |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1250 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1251 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1252 $ hg debugobsolete --index --rev "3+7" -Tjson |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1253 [ |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1254 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1255 "date": *, (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1256 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1257 "index": 1, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1258 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1259 "precnode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1260 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1261 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1262 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1263 "date": *, (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1264 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1265 "index": 3, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1266 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1267 "precnode": "4715cf767440ed891755448016c2b8cf70760c30", |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1268 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1269 } |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1270 ] |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1271 |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1272 Test the --delete option of debugobsolete command |
28867
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1273 $ hg debugobsolete --index |
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1274 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1275 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1276 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1277 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) |
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1278 $ hg debugobsolete --delete 1 --delete 3 |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
29795
diff
changeset
|
1279 deleted 2 obsolescence markers |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1280 $ hg debugobsolete |
28867
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1281 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1282 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1283 $ cd .. |
28867
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1284 |