Mercurial > hg
annotate tests/test-obsolete.t @ 40413:1ddd202c47d9
help: allow hiding of help topics
Differential Revision: https://phab.mercurial-scm.org/D5077
author | rdamazio@google.com |
---|---|
date | Sat, 13 Oct 2018 05:43:39 -0700 |
parents | a4d62ff9a86d |
children | 191fac9ff9d3 |
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] |
34847
e27f1f04c2cf
templatekw: introduce obsfate keyword
Boris Feld <boris.feld@octobus.net>
parents:
34717
diff
changeset
|
6 > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\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): |
36494
f1e05fe1a78f
py3: add b'' prefixes in tests/test-obsolete.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36322
diff
changeset
|
21 > ui.write(b'listkeys %s\n' % (namespace,)) |
17252
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] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
42 > evolution=exchange |
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
43 > evolution.createmarkers=True |
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
|
44 > EOF |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
45 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
46 Killing a single changeset without replacement |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
47 |
17292
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
48 $ hg debugobsolete 0 |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
49 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
|
50 [255] |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
51 $ hg debugobsolete '00' |
8da6fe276a23
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents:
17252
diff
changeset
|
52 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
|
53 [255] |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
54 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
55 obsoleted 1 changesets |
17074
178a2e85d426
debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents:
17071
diff
changeset
|
56 $ hg debugobsolete |
22220
908c76e84ec5
debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22207
diff
changeset
|
57 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
|
58 |
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
59 (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
|
60 |
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
61 $ 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
|
62 $ hg tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
63 -1:000000000000 (public) [tip ] |
18464
a2e9fe93d9ea
changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18428
diff
changeset
|
64 $ hg up --hidden tip --quiet |
37920
ea63a2004d09
update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents:
37846
diff
changeset
|
65 updated to hidden changeset 97b7c2d76b18 |
35711
35a0f6f31eef
update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents:
35710
diff
changeset
|
66 (hidden revision '97b7c2d76b18' is pruned) |
22177
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
67 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
68 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
|
69 (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
|
70 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
71 $ 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
|
72 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
|
73 [255] |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
74 |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
75 $ cd .. |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
76 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
77 Killing a single changeset with replacement |
22948
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
78 (and testing the format option) |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
79 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
80 $ hg init tmpb |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
81 $ cd tmpb |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
82 $ mkcommit a |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
83 $ mkcommit b |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
84 $ mkcommit original_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
85 $ hg up "desc('b')" |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
86 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
|
87 $ mkcommit new_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
88 created new head |
17390
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
89 $ 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
|
90 $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
91 obsoleted 1 changesets |
17390
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
92 $ 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
|
93 2:245bde4270cd add original_c |
21033
254f55b64e31
debugrevlog: use unfiltered view for changelog
Matt Mackall <mpm@selenic.com>
parents:
20807
diff
changeset
|
94 $ hg debugrevlog -cd |
22311
5038dee5bdd6
debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents:
22274
diff
changeset
|
95 # 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
|
96 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
|
97 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
|
98 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
|
99 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
|
100 $ 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
|
101 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
|
102 |
22948
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
103 (check for version number of the obsstore) |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
104 |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
105 $ 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
|
106 \x00 (no-eol) (esc) |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
107 |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
108 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
|
109 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
110 $ hg up '.^' |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
111 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
|
112 $ mkcommit new_2_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
113 created new head |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
114 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
115 obsoleted 1 changesets |
17074
178a2e85d426
debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents:
17071
diff
changeset
|
116 $ 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
|
117 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
|
118 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
|
119 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
120 Register two markers with a missing node |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
121 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
122 $ hg up '.^' |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
123 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
|
124 $ mkcommit new_3_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
125 created new head |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
126 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
127 obsoleted 1 changesets |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
128 $ 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
|
129 $ 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
|
130 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
|
131 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
|
132 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
|
133 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
|
134 |
28613
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
135 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
|
136 $ hg debugobsolete --index |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
137 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
|
138 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
|
139 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
|
140 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
|
141 |
17774
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
142 Refuse pathological nullid successors |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
143 $ 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
|
144 transaction abort! |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
145 rollback completed |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
146 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
|
147 [255] |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
148 |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
149 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
|
150 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
151 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
152 @ 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
|
153 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
154 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
|
155 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
156 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
|
157 |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
158 |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
159 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
|
160 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
161 $ hg heads |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
162 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
|
163 $ hg heads --hidden |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
164 5:5601fb93a350 (draft) [tip ] add new_3_c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
165 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
166 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
167 2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163] |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
168 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
169 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
170 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
|
171 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
172 $ 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
|
173 $ 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
|
174 $ 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
|
175 $ 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
|
176 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
|
177 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
|
178 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
|
179 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
|
180 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25351
diff
changeset
|
181 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
|
182 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
|
183 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
184 $ 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
|
185 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
|
186 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
|
187 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
|
188 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
|
189 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
|
190 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
|
191 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
|
192 |
18423
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
193 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
|
194 |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
195 $ hg tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
196 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
|
197 $ 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
|
198 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
|
199 [255] |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
200 $ hg log -r 4 |
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
35518
diff
changeset
|
201 abort: hidden revision '4' was rewritten as: 5601fb93a350! |
23046
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
202 (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
|
203 [255] |
23062
ba89f7b542c9
revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
Yuya Nishihara <yuya@tcha.org>
parents:
23046
diff
changeset
|
204 $ 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
|
205 $ 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
|
206 $ hg debugrevspec 'null' |
d2de20e1451f
revset: extend fullreposet to make "null" revision magically appears in set
Yuya Nishihara <yuya@tcha.org>
parents:
24162
diff
changeset
|
207 -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
|
208 |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
209 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
|
210 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18104
diff
changeset
|
211 $ hg --hidden phase --public 2 |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35611
diff
changeset
|
212 1 new phase-divergent changesets |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
213 $ hg log -G |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
214 @ 5:5601fb93a350 (draft phase-divergent) [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
|
215 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
216 | 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
|
217 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
218 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
|
219 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
220 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
|
221 |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
222 |
17829
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
223 And that bumped changeset are detected |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
224 -------------------------------------- |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
225 |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
226 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
|
227 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
|
228 the public changeset |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
229 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
230 $ hg log --hidden -r 'phasedivergent()' |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
231 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
17829
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
232 |
17834
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
233 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
|
234 |
18085
4c53f015564f
test: fix truncated comment in test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18015
diff
changeset
|
235 $ 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
|
236 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
|
237 searching for changes |
18104
a2cebd3e4daa
clfilter: use filtering in `visibleheads`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18085
diff
changeset
|
238 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
|
239 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
|
240 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
|
241 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
|
242 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
|
243 $ hg push ../tmpa |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
244 pushing to ../tmpa |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
245 searching for changes |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
246 abort: push includes phase-divergent changeset: 5601fb93a350! |
17834
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
247 [255] |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
248 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
249 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
|
250 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
|
251 |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
252 $ hg summary |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
253 parent: 5:5601fb93a350 tip (phase-divergent) |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
254 add new_3_c |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
255 branch: default |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
256 commit: (clean) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
257 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
|
258 phases: 1 draft |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
259 phase-divergent: 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
|
260 $ 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
|
261 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
|
262 $ 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
|
263 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
|
264 $ 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
|
265 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
|
266 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
267 obsoleted 1 changesets |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
268 $ hg log -r 'phasedivergent()' |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
269 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
270 @ 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
|
271 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
272 | 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
|
273 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
274 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
|
275 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
276 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
|
277 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
278 |
32626
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
279 Basic exclusive testing |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
280 |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
281 $ hg log -G --hidden |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
282 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
283 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
284 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] |
32626
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
285 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
286 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
32626
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
287 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
288 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
32626
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
289 |/ |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
290 | o 2:245bde4270cd (public) [ ] add original_c |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
291 |/ |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
292 o 1:7c3bad9141dc (public) [ ] add b |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
293 | |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
294 o 0:1f0dee641bb7 (public) [ ] add a |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
295 |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
296 $ hg debugobsolete --rev 6f9641995072 |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
297 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
298 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
299 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
300 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
301 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
302 $ hg debugobsolete --rev 6f9641995072 --exclusive |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
303 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
304 $ hg debugobsolete --rev 5601fb93a350 --hidden |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
305 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
306 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
307 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
308 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
309 $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
310 $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
311 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
312 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
313 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
00a7f7b1af9c
obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32623
diff
changeset
|
314 |
24681
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
315 $ cd .. |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
316 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
317 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
|
318 -------------------- |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
319 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
320 $ hg init rev0hidden |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
321 $ cd rev0hidden |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
322 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
323 $ mkcommit kill0 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
324 $ 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
|
325 $ hg debugobsolete `getid kill0` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
326 obsoleted 1 changesets |
24681
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
327 $ mkcommit a |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
328 $ mkcommit b |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
329 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
330 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
|
331 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
332 $ 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
|
333 $ 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
|
334 repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
335 node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
336 branch: default |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
337 latesttag: null |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
338 latesttagdistance: 2 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
339 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
|
340 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
341 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
342 $ cd .. |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
343 |
35710
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
344 Can disable transaction summary report |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
345 |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
346 $ hg init transaction-summary |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
347 $ cd transaction-summary |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
348 $ mkcommit a |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
349 $ mkcommit b |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
350 $ hg up -q null |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
351 $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a` |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
352 obsoleted 1 changesets |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
353 $ cd .. |
5cd60b0587a8
evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents:
35709
diff
changeset
|
354 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
355 Exchange Test |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
356 ============================ |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
357 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
358 Destination repo does not have any data |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
359 --------------------------------------- |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
360 |
18493
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
361 Simple incoming test |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
362 |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
363 $ hg init tmpc |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
364 $ cd tmpc |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
365 $ hg incoming ../tmpb |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
366 comparing with ../tmpb |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
367 0:1f0dee641bb7 (public) [ ] add a |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
368 1:7c3bad9141dc (public) [ ] add b |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
369 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
370 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
|
371 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
372 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
|
373 (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
|
374 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
375 $ hg pull ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
376 pulling from ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
377 requesting all changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
378 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
379 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
380 adding file changes |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
381 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
|
382 5 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38239
diff
changeset
|
383 new changesets 1f0dee641bb7:6f9641995072 (1 drafts) |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
384 (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
|
385 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
386 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
|
387 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
|
388 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
|
389 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
|
390 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
|
391 |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
392 Rollback//Transaction support |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
393 |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
394 $ 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
|
395 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 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
|
400 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
|
401 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
|
402 $ hg rollback -n |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
403 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
|
404 $ hg rollback |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
405 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
|
406 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
407 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
|
408 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
|
409 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
|
410 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
|
411 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
|
412 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
413 $ cd .. |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
414 |
18492
45445187d286
test: minor documentation fix
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18464
diff
changeset
|
415 Try to push markers |
17075
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 $ hg init tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
418 $ hg -R tmpb push tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
419 pushing to tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
420 searching for changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
421 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
422 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
423 adding file changes |
17169
c18ecebed3f1
push: refuse to push obsolete changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17126
diff
changeset
|
424 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
|
425 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
|
426 $ 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
|
427 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
|
428 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
|
429 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
|
430 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
|
431 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
|
432 |
17252
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
433 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
|
434 |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
435 $ 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
|
436 $ 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
|
437 pushing to tmpd |
22019
9fcf772f15ff
push: perform phases discovery before the push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21978
diff
changeset
|
438 listkeys phases |
22239
0688010ee38f
push: move bookmark discovery with other discovery steps
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22220
diff
changeset
|
439 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
|
440 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
|
441 listkeys phases |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
442 [1] |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
443 |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
444 clone support |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
445 (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
|
446 |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
447 $ hg clone tmpb clone-dest |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
448 updating to branch default |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
449 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
|
450 $ 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
|
451 @ 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
|
452 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
453 | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072] |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
454 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
455 | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350] |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
456 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
457 | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9] |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
458 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
459 | 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
|
460 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
461 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
|
462 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
463 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
|
464 |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
465 $ 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
|
466 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
|
467 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
|
468 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
|
469 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
|
470 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
|
471 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
472 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
473 Destination repo have existing data |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
474 --------------------------------------- |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
475 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
476 On pull |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
477 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
478 $ hg init tmpe |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
479 $ 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
|
480 $ 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
|
481 $ hg pull ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
482 pulling from ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
483 requesting all changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
484 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
485 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
486 adding file changes |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
487 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
|
488 5 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38239
diff
changeset
|
489 new changesets 1f0dee641bb7:6f9641995072 (1 drafts) |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
490 (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
|
491 $ 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
|
492 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
|
493 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
|
494 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
|
495 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
|
496 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
|
497 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
|
498 |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
499 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
500 On push |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
501 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
502 $ hg push ../tmpc |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
503 pushing to ../tmpc |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
504 searching for changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
505 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
|
506 1 new obsolescence markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
507 [1] |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
508 $ hg -R ../tmpc debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
509 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
|
510 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
|
511 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
|
512 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
|
513 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
|
514 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
|
515 |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
516 detect outgoing obsolete and unstable |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
517 --------------------------------------- |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
518 |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
519 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
520 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
521 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
|
522 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
523 | 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
|
524 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
525 o 1:7c3bad9141dc (public) [ ] add b |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
526 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
527 o 0:1f0dee641bb7 (public) [ ] add a |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
528 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
529 $ 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
|
530 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
|
531 $ mkcommit original_d |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
532 $ 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
|
533 $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
534 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35611
diff
changeset
|
535 1 new orphan changesets |
22272
406181ee335f
debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22239
diff
changeset
|
536 $ 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
|
537 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
|
538 $ hg log -r 'obsolete()' |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
539 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
540 $ hg summary |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
541 parent: 5:cda648ca50f5 tip (orphan) |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
542 add original_e |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
543 branch: default |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
544 commit: (clean) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
545 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
|
546 phases: 3 draft |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
547 orphan: 1 changesets |
33774
9dcc3529e002
revset: rename unstable into orphan
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
548 $ hg log -G -r '::orphan()' |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
549 @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
550 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
551 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
552 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
553 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
|
554 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
555 o 1:7c3bad9141dc (public) [ ] add b |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
556 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
557 o 0:1f0dee641bb7 (public) [ ] add a |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
558 |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
559 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
560 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
|
561 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
562 $ 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
|
563 pushing to ../tmpc/ |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
564 searching for changes |
17833
0c1185f6ddd7
obsolete: simplify push abort message
push includes an xxx changeset: yyyyyyyyyy
parents:
17831
diff
changeset
|
565 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
|
566 [255] |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
567 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
568 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
|
569 |
17172
12fdaa30063a
push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17171
diff
changeset
|
570 $ 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
|
571 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
|
572 searching for changes |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
573 abort: push includes orphan 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
|
574 [255] |
17173
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
575 |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
576 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
|
577 |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
578 $ 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
|
579 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
580 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
|
581 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
582 $ hg init ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
583 $ hg out ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
584 comparing with ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
585 searching for changes |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
586 0:1f0dee641bb7 (public) [ ] add a |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
587 1:7c3bad9141dc (public) [ ] add b |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
588 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
589 3:6f9641995072 (draft) [ ] add n3w_3_c |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
590 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
591 5:cda648ca50f5 (draft orphan) [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
|
592 $ 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
|
593 pushing to ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
594 searching for changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
595 adding changesets |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
596 adding manifests |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
597 adding file changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
598 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
|
599 7 new obsolescence markers |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35611
diff
changeset
|
600 1 new orphan changesets |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
601 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
602 no warning displayed |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
603 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
604 $ hg push ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
605 pushing to ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
606 searching for changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
607 no changes found |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
608 [1] |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
609 |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
610 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
|
611 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
612 $ hg log -G |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
613 @ 5:cda648ca50f5 (draft orphan) [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
|
614 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
615 x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
616 | |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
617 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
|
618 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
619 | 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
|
620 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
621 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
|
622 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
623 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
|
624 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
625 $ 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
|
626 $ mkcommit obsolete_e |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
627 created new head |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
628 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ |
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
629 > -u 'test <test@example.net>' |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
630 obsoleted 1 changesets |
18493
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
631 $ 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
|
632 comparing with ../tmpf |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
633 searching for changes |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
634 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
|
635 $ hg push ../tmpf |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
636 pushing to ../tmpf |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
637 searching for changes |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
638 adding changesets |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
639 adding manifests |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
640 adding file changes |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
641 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
|
642 1 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
33097
diff
changeset
|
643 obsoleted 1 changesets |
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
|
644 |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
645 test relevance computation |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
646 --------------------------------------- |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
647 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
648 Checking simple case of "marker relevance". |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
649 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
650 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
651 Reminder of the repo situation |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
652 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
653 $ hg log --hidden --graph |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
654 @ 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
|
655 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
656 | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>] |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
657 | | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
658 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
659 |/ |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
660 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
|
661 | |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
662 | 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
|
663 |/ |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
664 o 1:7c3bad9141dc (public) [ ] add b |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
665 | |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
666 o 0:1f0dee641bb7 (public) [ ] add a |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
667 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
668 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
669 List of all markers |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
670 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
671 $ 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
|
672 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
|
673 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
|
674 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
|
675 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
|
676 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
|
677 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
|
678 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
679 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
680 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
681 List of changesets with no chain |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
682 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
683 $ hg debugobsolete --hidden --rev ::2 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
684 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
685 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
|
686 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
687 $ hg debugobsolete --hidden --rev 6 |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
688 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
689 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
690 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
|
691 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
692 $ hg debugobsolete --hidden --rev 3 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
693 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
|
694 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
|
695 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
|
696 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
|
697 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
|
698 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
|
699 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
|
700 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
701 List of both |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
702 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
703 $ hg debugobsolete --hidden --rev 3::6 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
704 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
|
705 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
|
706 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
|
707 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
|
708 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
|
709 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
710 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
711 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
|
712 |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
713 List of all markers in JSON |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
714 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
715 $ hg debugobsolete -Tjson |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
716 [ |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
717 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
718 "date": [1339, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
719 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
720 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
721 "prednode": "1339133913391339133913391339133913391339", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
722 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
723 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
724 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
725 "date": [1339, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
726 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
727 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
728 "prednode": "1337133713371337133713371337133713371337", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
729 "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
730 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
731 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
732 "date": [121, 120], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
733 "flag": 12, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
734 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
735 "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
736 "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
737 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
738 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
739 "date": [1338, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
740 "flag": 1, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
741 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
742 "prednode": "5601fb93a350734d935195fee37f4054c529ff39", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
743 "succnodes": ["6f96419950729f3671185b847352890f074f7557"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
744 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
745 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
746 "date": [1338, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
747 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
748 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
749 "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
750 "succnodes": ["1337133713371337133713371337133713371337"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
751 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
752 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
753 "date": [1337, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
754 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
755 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
756 "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
757 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
758 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
759 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
760 "date": [0, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
761 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
762 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
763 "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
764 "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
765 "succnodes": [] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
766 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
767 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
768 "date": *, (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
769 "flag": 0, |
32743
f924dd043974
json: pass formatting options recursively
Yuya Nishihara <yuya@tcha.org>
parents:
32741
diff
changeset
|
770 "metadata": {"user": "test <test@example.net>"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
771 "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
772 "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
773 } |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
774 ] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
775 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
776 Template keywords |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
777 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
778 $ 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
|
779 3de5eca88c00 ????-??-?? (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
780 $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
781 user=test <test@example.net> |
34425
12bfecd0ffe6
formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents:
34286
diff
changeset
|
782 $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n' |
12bfecd0ffe6
formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents:
34286
diff
changeset
|
783 'user': 'test <test@example.net>' |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
784 'user': 'test <test@example.net>' |
34425
12bfecd0ffe6
formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents:
34286
diff
changeset
|
785 $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n' |
12bfecd0ffe6
formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents:
34286
diff
changeset
|
786 3de5eca88c00aa039da7399a220f4a5221faa585 |
12bfecd0ffe6
formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents:
34286
diff
changeset
|
787 3de5eca88c00aa039da7399a220f4a5221faa585 |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
788 $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
789 0 test <test@example.net> |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
790 |
24733
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
791 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
|
792 ---------------------------------- |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
793 |
29688
30c59bdd4f41
tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29657
diff
changeset
|
794 $ 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
|
795 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
|
796 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
|
797 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
|
798 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
|
799 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
800 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
|
801 ==================================== |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
802 |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
803 $ 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
|
804 adding changesets |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
805 adding manifests |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
806 adding file changes |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
807 added 62 changesets with 63 changes to 9 files (+60 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38239
diff
changeset
|
808 new changesets 50c51b361e60:c15e9edfca13 (62 drafts) |
39900
a89dd6d01df0
pullreport: rev duplicated and extinct into account
Boris Feld <boris.feld@octobus.net>
parents:
39899
diff
changeset
|
809 (2 other changesets obsolete on arrival) |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
810 (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
|
811 $ 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
|
812 > do |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
813 > hg debugobsolete $node |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
814 > done |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
815 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
816 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
817 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
818 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
819 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
820 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
821 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
822 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
823 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
824 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
825 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
826 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
827 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
828 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
829 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
830 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
831 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
832 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
833 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
834 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
835 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
836 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
837 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
838 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
839 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
840 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
841 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
842 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
843 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
844 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
845 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
846 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
847 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
848 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
849 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
850 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
851 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
852 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
853 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
854 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
855 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
856 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
857 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
858 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
859 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
860 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
861 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
862 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
863 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
864 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
865 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
866 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
867 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
868 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
869 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
870 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
871 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
872 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
873 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
874 obsoleted 1 changesets |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
875 $ hg up tip |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
876 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
|
877 |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
878 #if serve |
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
879 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
880 $ 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
|
881 $ 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
|
882 |
18426
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
883 check changelog view |
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
884 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
885 $ 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
|
886 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
|
887 |
18428
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
888 check graph view |
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
889 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
890 $ 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
|
891 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
|
892 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
893 check filelog view |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
894 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
895 $ 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
|
896 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
|
897 |
37362
c16b55edd408
tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents:
37346
diff
changeset
|
898 check filelog view for hidden commits (obsolete ones are hidden here) |
c16b55edd408
tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents:
37346
diff
changeset
|
899 |
c16b55edd408
tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents:
37346
diff
changeset
|
900 $ get-with-headers.py localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | grep obsolete |
37363
d3a2344446e6
hgweb: don't include hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents:
37362
diff
changeset
|
901 [1] |
37362
c16b55edd408
tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents:
37346
diff
changeset
|
902 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
903 $ 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
|
904 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
905 $ 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
|
906 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
|
907 [1] |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
908 |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
909 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
|
910 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
911 $ 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
|
912 $ 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
|
913 > [web] |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
914 > view=all |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
915 > EOF |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
916 $ wait |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
917 $ 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
|
918 $ 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
|
919 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
920 $ 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
|
921 |
17306
7d2967de2c04
obsolete: fix typos in comments introduced by 6955d69a52a4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17297
diff
changeset
|
922 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
|
923 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
924 $ echo '[experimental]' >> $HGRCPATH |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
925 $ 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
|
926 $ hg log -r tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
927 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
|
928 |
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
|
929 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
|
930 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
931 $ echo '[experimental]' >> $HGRCPATH |
34868
44797aedfb35
config: use 'experimental.evolution.exchange'
Boris Feld <boris.feld@octobus.net>
parents:
34866
diff
changeset
|
932 $ echo "evolution.exchange=True" >> $HGRCPATH |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
933 $ echo "evolution.createmarkers=True" >> $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
|
934 |
37846
89793289c891
tests: remove pid file by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37770
diff
changeset
|
935 $ rm access.log errors.log |
18506
ef60083b5536
tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents:
18493
diff
changeset
|
936 #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
|
937 |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
938 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
|
939 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
940 $ hg debugobsolete `getid obsolete_e` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
941 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35611
diff
changeset
|
942 2 new orphan changesets |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
943 $ hg debugobsolete `getid original_c` `getid babar` |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35611
diff
changeset
|
944 1 new phase-divergent changesets |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
945 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
946 changeset: 7:50c51b361e60 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
947 user: test |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
948 date: Thu Jan 01 00:00:00 1970 +0000 |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
949 instability: orphan, phase-divergent |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
950 summary: add babar |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
951 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
952 |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
953 test the "obsolete" templatekw |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
954 |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
955 $ hg log -r 'obsolete()' |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
956 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
957 |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
958 test the "troubles" templatekw |
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
959 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
960 $ hg log -r 'phasedivergent() and orphan()' |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
961 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
962 |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
963 test the default cmdline template |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
964 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
965 $ hg log -T default -r 'phasedivergent()' |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
966 changeset: 7:50c51b361e60 |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
967 user: test |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
968 date: Thu Jan 01 00:00:00 1970 +0000 |
33709
511d6ae462f3
template: rename troubles templatekw into instabilities
Boris Feld <boris.feld@octobus.net>
parents:
33689
diff
changeset
|
969 instability: orphan, phase-divergent |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
970 summary: add babar |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
971 |
31702
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
972 $ 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
|
973 changeset: 6:3de5eca88c00 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
974 parent: 3:6f9641995072 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
975 user: test |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
976 date: Thu Jan 01 00:00:00 1970 +0000 |
34901
ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34900
diff
changeset
|
977 obsolete: pruned |
31702
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
978 summary: add obsolete_e |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
979 |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
980 |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
981 test the obsolete labels |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
982 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
983 $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' |
33782
40739aef97f7
label: rename trouble.X into instability.X
Boris Feld <boris.feld@octobus.net>
parents:
33781
diff
changeset
|
984 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
985 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
986 [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
33783
db6b666ce1e6
label: rename log.trouble into log.instability
Boris Feld <boris.feld@octobus.net>
parents:
33782
diff
changeset
|
987 [log.instability|instability: orphan, phase-divergent] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
988 [log.summary|summary: add babar] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
989 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
990 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
991 $ hg log -T default -r 'phasedivergent()' --color=debug |
34717
06b52671552b
templates: fix missed space between instability labels
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
992 [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
993 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
994 [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
33783
db6b666ce1e6
label: rename log.trouble into log.instability
Boris Feld <boris.feld@octobus.net>
parents:
33782
diff
changeset
|
995 [log.instability|instability: orphan, phase-divergent] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
996 [log.summary|summary: add babar] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
997 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
998 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
999 $ hg log --config ui.logtemplate= --color=debug -r "obsolete()" |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1000 [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1001 [log.parent changeset.draft|parent: 3:6f9641995072] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1002 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1003 [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
34900
3a3adbcbd3a0
obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents:
34870
diff
changeset
|
1004 [log.obsfate|obsolete: pruned] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1005 [log.summary|summary: add obsolete_e] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1006 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1007 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1008 $ hg log -T default -r 'obsolete()' --color=debug |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1009 [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1010 [log.parent changeset.draft|parent: 3:6f9641995072] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1011 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1012 [log.date|date: Thu Jan 01 00:00:00 1970 +0000] |
34901
ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents:
34900
diff
changeset
|
1013 [log.obsfate|obsolete: pruned] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1014 [log.summary|summary: add obsolete_e] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1015 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
1016 |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1017 test summary output |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1018 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
1019 $ hg up -r 'phasedivergent() and orphan()' |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1020 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
|
1021 $ hg summary |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1022 parent: 7:50c51b361e60 (orphan, phase-divergent) |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1023 add babar |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1024 branch: default |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
1025 commit: (clean) |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1026 update: 2 new changesets (update) |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1027 phases: 4 draft |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
1028 orphan: 2 changesets |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1029 phase-divergent: 1 changesets |
31703
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1030 $ hg up -r 'obsolete()' |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1031 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
|
1032 $ hg summary |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1033 parent: 6:3de5eca88c00 (obsolete) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1034 add obsolete_e |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1035 branch: default |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1036 commit: (clean) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1037 update: 3 new changesets (update) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1038 phases: 4 draft |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
1039 orphan: 2 changesets |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1040 phase-divergent: 1 changesets |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1041 |
36954
efc4fb344c05
debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents:
36494
diff
changeset
|
1042 test debugwhyunstable output |
efc4fb344c05
debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents:
36494
diff
changeset
|
1043 |
efc4fb344c05
debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents:
36494
diff
changeset
|
1044 $ hg debugwhyunstable 50c51b361e60 |
efc4fb344c05
debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents:
36494
diff
changeset
|
1045 orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585 |
efc4fb344c05
debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents:
36494
diff
changeset
|
1046 phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca |
efc4fb344c05
debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents:
36494
diff
changeset
|
1047 |
37685
76cd5816268e
templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
37416
diff
changeset
|
1048 test whyunstable template keyword |
76cd5816268e
templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
37416
diff
changeset
|
1049 |
76cd5816268e
templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
37416
diff
changeset
|
1050 $ hg log -r 50c51b361e60 -T '{whyunstable}\n' |
76cd5816268e
templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
37416
diff
changeset
|
1051 orphan: obsolete parent 3de5eca88c00 |
76cd5816268e
templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
37416
diff
changeset
|
1052 phase-divergent: immutable predecessor 245bde4270cd |
37705
82eeafd78784
tests: make custom templates that use {whyunstable} terser
Anton Shestakov <av6@dwimlabs.net>
parents:
37685
diff
changeset
|
1053 $ hg log -r 50c51b361e60 -T '{whyunstable % "{instability}: {reason} {node|shortest}\n"}' |
82eeafd78784
tests: make custom templates that use {whyunstable} terser
Anton Shestakov <av6@dwimlabs.net>
parents:
37685
diff
changeset
|
1054 orphan: obsolete parent 3de5 |
82eeafd78784
tests: make custom templates that use {whyunstable} terser
Anton Shestakov <av6@dwimlabs.net>
parents:
37685
diff
changeset
|
1055 phase-divergent: immutable predecessor 245b |
37685
76cd5816268e
templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents:
37416
diff
changeset
|
1056 |
35089
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1057 #if serve |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1058 |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1059 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1060 $ cat hg.pid >> $DAEMON_PIDS |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1061 |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1062 check obsolete changeset |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1063 |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1064 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">' |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1065 <span class="phase">draft</span> <span class="obsolete">obsolete</span> |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1066 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">' |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1067 <span class="phase">draft</span> <span class="obsolete">obsolete</span> |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1068 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">' |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1069 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1070 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">' |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1071 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span> |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1072 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"' |
36322
f3fd4fe0506f
hgweb: show each obsfateentry on its own line
Anton Shestakov <av6@dwimlabs.net>
parents:
36321
diff
changeset
|
1073 <th class="obsolete">obsolete:</th> |
f3fd4fe0506f
hgweb: show each obsfateentry on its own line
Anton Shestakov <av6@dwimlabs.net>
parents:
36321
diff
changeset
|
1074 <td class="obsolete">pruned by test <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td> |
35485
1721ce06100a
hgweb: display fate of obsolete changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
35393
diff
changeset
|
1075 |
35094
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1076 check changeset with instabilities |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1077 |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1078 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">' |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1079 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1080 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">' |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1081 <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1082 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">' |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1083 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1084 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">' |
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1085 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span> |
37024
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1086 $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"' |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1087 <th class="unstable">unstable:</th> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1088 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1089 <th class="unstable">unstable:</th> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1090 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td> |
35094
38fe3fe4bbb6
hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
35089
diff
changeset
|
1091 |
36955
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1092 check explanation for an orphan and phase-divergent changeset |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1093 |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1094 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent):' |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1095 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br> |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1096 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td> |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1097 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent):' |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1098 <td>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br> |
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1099 phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td> |
37024
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1100 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent):' |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1101 <td>orphan: obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1102 <td>phase-divergent: immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1103 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent):' |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1104 <dd>orphan: obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1105 <dd>phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1106 $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent):' |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1107 <td class="unstable">orphan: obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td> |
7c18798fc24d
hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents:
36965
diff
changeset
|
1108 <td class="unstable">phase-divergent: immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td> |
36955
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1109 |
35089
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1110 $ killdaemons.py |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1111 |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1112 $ rm hg.pid access.log errors.log |
36955
f21798a6bc20
hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents:
36954
diff
changeset
|
1113 |
35089
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1114 #endif |
69ea10d5b00c
hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents:
34961
diff
changeset
|
1115 |
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
|
1116 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
|
1117 =============================================================================== |
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
|
1118 |
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
|
1119 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
|
1120 |
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
|
1121 $ 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
|
1122 $ 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
|
1123 $ 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
|
1124 $ 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
|
1125 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
|
1126 $ 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
|
1127 $ 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
|
1128 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
|
1129 $ 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
|
1130 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
|
1131 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
|
1132 $ 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
|
1133 $ 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
|
1134 $ 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
|
1135 $ 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
|
1136 @ 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
|
1137 | |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1138 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
|
1139 |
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
|
1140 $ hg log -G -R ../repo-issue3805 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1141 @ 2:323a9c3ddd91 (draft) [tip ] 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
|
1142 | |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1143 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
|
1144 |
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
|
1145 $ hg incoming |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35094
diff
changeset
|
1146 comparing with $TESTTMP/tmpe/repo-issue3805 |
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
|
1147 searching for changes |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1148 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
|
1149 $ hg incoming --bundle ../issue3805.hg |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35094
diff
changeset
|
1150 comparing with $TESTTMP/tmpe/repo-issue3805 |
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
|
1151 searching for changes |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1152 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
|
1153 $ hg outgoing |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35094
diff
changeset
|
1154 comparing with $TESTTMP/tmpe/repo-issue3805 |
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
|
1155 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
|
1156 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
|
1157 |
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
|
1158 #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
|
1159 |
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
|
1160 $ 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
|
1161 $ 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
|
1162 |
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
|
1163 $ 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
|
1164 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
|
1165 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
|
1166 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
|
1167 $ 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
|
1168 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
|
1169 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
|
1170 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
|
1171 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
1172 $ 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
|
1173 |
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
|
1174 #endif |
18617
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1175 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1176 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
|
1177 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1178 (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
|
1179 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1180 $ cd .. |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1181 $ 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
|
1182 $ 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
|
1183 $ 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
|
1184 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
|
1185 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
|
1186 adding changesets |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1187 adding manifests |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1188 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
|
1189 added 2 changesets with 2 changes to 2 files |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1190 1 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
|
1191 $ 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
|
1192 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
|
1193 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
|
1194 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
|
1195 [1] |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1196 |
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
|
1197 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
|
1198 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1199 $ 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
|
1200 $ hg log -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1201 @ 2:323a9c3ddd91 (draft) [tip ] 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
|
1202 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1203 | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91] |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1204 |/ |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1205 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
|
1206 |
21823
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
1207 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
|
1208 |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
1209 $ 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
|
1210 $ hg tags |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1211 tiptag 2:323a9c3ddd91 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1212 tip 2:323a9c3ddd91 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1213 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
|
1214 $ 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
|
1215 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
|
1216 $ 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
|
1217 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
|
1218 tip 1:29f0c6921ddd |
24113
b08af8f0ac01
localrepo: don't reintroduce pruned tag entries when tagging
Matt Harbison <matt_harbison@yahoo.com>
parents:
23632
diff
changeset
|
1219 |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1220 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
|
1221 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1222 $ cd .. |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1223 $ hg init repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1224 $ cd repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1225 $ echo "A" > foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1226 $ hg ci -Am "A" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1227 adding foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1228 $ echo "B" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1229 $ hg ci -m "B" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1230 $ hg up 0 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1231 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
|
1232 $ echo "C" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1233 $ hg ci -m "C" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1234 created new head |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1235 $ hg log -G |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1236 @ 2:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1237 | |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1238 | o 1:44526ebb0f98 (draft) [ ] B |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1239 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1240 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1241 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1242 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1243 $ hg clone -r1 . ../other-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1244 adding changesets |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1245 adding manifests |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1246 adding file changes |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1247 added 2 changesets with 2 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38239
diff
changeset
|
1248 new changesets 4b34ecfb0d56:44526ebb0f98 (2 drafts) |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1249 updating to branch default |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1250 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
|
1251 $ cd ../other-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1252 $ echo "B+" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1253 $ hg ci --amend -m "B+" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1254 $ hg log -G --hidden |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1255 @ 2:b7d587542d40 (draft) [tip ] B+ |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1256 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1257 | x 1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40] |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1258 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1259 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1260 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1261 |
37346
45a4799174a1
tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37024
diff
changeset
|
1262 #if repobundlerepo |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1263 $ 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
|
1264 comparing with ../repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1265 searching for changes |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1266 1:44526ebb0f98 (draft) [ ] B |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1267 2:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1268 $ hg log -G -R ../bundleoverlay.hg |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1269 o 3:c186d7714947 (draft) [tip ] C |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1270 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1271 | @ 2:b7d587542d40 (draft) [ ] B+ |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1272 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1273 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1274 |
37346
45a4799174a1
tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37024
diff
changeset
|
1275 #endif |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1276 |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1277 #if serve |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1278 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1279 Test issue 4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1280 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1281 $ cd .. |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1282 $ hg init repo-issue4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1283 $ cd repo-issue4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1284 $ echo "0" > foo |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1285 $ hg add foo |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1286 $ hg ci -m "content-0" |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1287 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1288 $ hg up null |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1289 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
|
1290 $ echo "1" > bar |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1291 $ hg add bar |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1292 $ hg ci -m "content-1" |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1293 created new head |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1294 $ hg up 0 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1295 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
|
1296 $ hg graft 1 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1297 grafting 1:1c9eddb02162 "content-1" (tip) |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1298 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1299 $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
1300 obsoleted 1 changesets |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1301 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1302 $ 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
|
1303 $ cat hg.pid >> $DAEMON_PIDS |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1304 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1305 $ 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
|
1306 404 Not Found |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1307 [1] |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1308 $ 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
|
1309 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1310 $ 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
|
1311 200 Script output follows |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1312 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
1313 $ killdaemons.py |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1314 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1315 #endif |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1316 |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1317 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
|
1318 $ cd .. |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1319 $ cat >$TESTTMP/test_extension.py << EOF |
33970
a65f928e47d5
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33856
diff
changeset
|
1320 > from __future__ import absolute_import |
a65f928e47d5
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33856
diff
changeset
|
1321 > from mercurial.i18n import _ |
38099
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1322 > from mercurial import cmdutil, pycompat, registrar |
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1323 > from mercurial.utils import stringutil |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1324 > |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1325 > cmdtable = {} |
32337
46ba2cdda476
registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
32327
diff
changeset
|
1326 > command = registrar.command(cmdtable) |
36494
f1e05fe1a78f
py3: add b'' prefixes in tests/test-obsolete.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36322
diff
changeset
|
1327 > @command(b"amendtransient",[], _(b'hg amendtransient [rev]')) |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1328 > def amend(ui, repo, *pats, **opts): |
38099
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1329 > opts = pycompat.byteskwargs(opts) |
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1330 > opts[b'message'] = b'Test' |
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1331 > opts[b'logfile'] = None |
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1332 > cmdutil.amend(ui, repo, repo[b'.'], {}, pats, opts) |
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1333 > ui.write(b'%s\n' % stringutil.pprint(repo.changelog.headrevs())) |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1334 > EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1335 $ cat >> $HGRCPATH << EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1336 > [extensions] |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1337 > testextension=$TESTTMP/test_extension.py |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1338 > EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1339 $ hg init repo-issue-nativerevs-pending-changes |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1340 $ cd repo-issue-nativerevs-pending-changes |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1341 $ mkcommit a |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1342 $ mkcommit b |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1343 $ hg up ".^" |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1344 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
|
1345 $ echo aa > a |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1346 $ hg amendtransient |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35611
diff
changeset
|
1347 1 new orphan changesets |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1348 [1, 2] |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1349 |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1350 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
|
1351 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
|
1352 bookmarks change |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1353 $ cd .. |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1354 $ cat >$TESTTMP/test_extension.py << EOF |
33991
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1355 > from __future__ import absolute_import, print_function |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1356 > import weakref |
33991
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1357 > from mercurial import ( |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1358 > bookmarks, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1359 > cmdutil, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1360 > extensions, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1361 > repoview, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1362 > ) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1363 > 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
|
1364 > reporef = weakref.ref(bkmstoreinst._repo) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1365 > def trhook(tr): |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1366 > repo = reporef() |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1367 > hidden1 = repoview.computehidden(repo) |
36494
f1e05fe1a78f
py3: add b'' prefixes in tests/test-obsolete.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36322
diff
changeset
|
1368 > hidden = repoview.filterrevs(repo, b'visible') |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1369 > if sorted(hidden1) != sorted(hidden): |
33991
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1370 > print("cache inconsistency") |
38099
5a87bf0bd343
tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents:
37920
diff
changeset
|
1371 > bkmstoreinst._repo.currenttransaction().addpostclose(b'test_extension', trhook) |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1372 > orig(bkmstoreinst, *args, **kwargs) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1373 > def extsetup(ui): |
33515
3325c7dcabaa
bookmark: deprecate 'recordchange' in favor of 'applychanges'
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1374 > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1375 > _bookmarkchanged) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1376 > EOF |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1377 |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1378 $ hg init repo-cache-inconsistency |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1379 $ cd repo-issue-nativerevs-pending-changes |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1380 $ mkcommit a |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1381 a already tracked! |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1382 $ mkcommit b |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1383 $ hg id |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1384 13bedc178fce tip |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1385 $ echo "hello" > b |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1386 $ hg commit --amend -m "message" |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1387 $ hg book bookb -r 13bedc178fce --hidden |
35611
7336ac5e786e
bookmarks: add bookmarks to hidden revs if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35571
diff
changeset
|
1388 bookmarking hidden changeset 13bedc178fce |
35712
a1a5c3842b6f
bookmarks: display the obsfate of hidden revision we create a bookmark on
Boris Feld <boris.feld@octobus.net>
parents:
35711
diff
changeset
|
1389 (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1390 $ hg log -r 13bedc178fce |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1391 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753] |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1392 $ hg book -d bookb |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1393 $ hg log -r 13bedc178fce |
35571
265cd9e19d26
visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents:
35518
diff
changeset
|
1394 abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753! |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1395 (use --hidden to access hidden revisions) |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1396 [255] |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1397 |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1398 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
|
1399 of the test. |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1400 $ echo > $TESTTMP/test_extension.py |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1401 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1402 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
|
1403 (issue4945) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1404 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1405 $ cd .. |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1406 $ hg init issue4845 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1407 $ cd issue4845 |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1408 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1409 $ echo foo > f0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1410 $ hg add f0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1411 $ 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
|
1412 $ echo foo > f1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1413 $ hg add f1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1414 $ 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
|
1415 $ echo foo > f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1416 $ hg add f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1417 $ 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
|
1418 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1419 $ echo bar > f2 |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
1420 $ hg commit --amend --config experimental.evolution.createmarkers=True |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1421 $ hg log -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1422 @ 3:b0551702f918 (draft) [tip ] 2 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1423 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1424 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
|
1425 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1426 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
|
1427 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1428 $ hg log -G --hidden |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1429 @ 3:b0551702f918 (draft) [tip ] 2 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1430 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1431 | x 2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918] |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1432 |/ |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1433 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
|
1434 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1435 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
|
1436 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1437 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1438 $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35094
diff
changeset
|
1439 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1440 $ hg debugobsolete |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1441 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1442 $ hg log -G |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1443 @ 2:b0551702f918 (draft) [tip ] 2 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1444 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1445 o 1:e016b03fd86f (draft) [ ] 1 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1446 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1447 o 0:a78f55e5508c (draft) [ ] 0 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1448 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1449 $ hg log -G --hidden |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1450 @ 2:b0551702f918 (draft) [tip ] 2 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1451 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1452 o 1:e016b03fd86f (draft) [ ] 1 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1453 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1454 o 0:a78f55e5508c (draft) [ ] 0 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1455 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1456 $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33991
diff
changeset
|
1457 Stream params: {Compression: BZ} |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
37770
diff
changeset
|
1458 changegroup -- {nbchanges: 1, version: 02} (mandatory: True) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1459 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37841
diff
changeset
|
1460 cache:rev-branch-cache -- {} (mandatory: False) |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
37770
diff
changeset
|
1461 phase-heads -- {} (mandatory: True) |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1462 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1463 |
37416
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37363
diff
changeset
|
1464 #if repobundlerepo |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1465 $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1466 pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1467 searching for changes |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1468 no changes found |
37416
7542e97c7867
tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37363
diff
changeset
|
1469 #endif |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1470 $ hg debugobsolete |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1471 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1472 $ hg log -G |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1473 @ 2:b0551702f918 (draft) [tip ] 2 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1474 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1475 o 1:e016b03fd86f (draft) [ ] 1 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1476 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1477 o 0:a78f55e5508c (draft) [ ] 0 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1478 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1479 $ hg log -G --hidden |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1480 @ 2:b0551702f918 (draft) [tip ] 2 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1481 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1482 o 1:e016b03fd86f (draft) [ ] 1 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1483 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1484 o 0:a78f55e5508c (draft) [ ] 0 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1485 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1486 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1487 Testing that strip remove markers: |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1488 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1489 $ 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
|
1490 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35094
diff
changeset
|
1491 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1492 $ hg debugobsolete |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1493 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1494 @ 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
|
1495 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1496 $ 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
|
1497 @ 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
|
1498 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1499 $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33991
diff
changeset
|
1500 Stream params: {Compression: BZ} |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
37770
diff
changeset
|
1501 changegroup -- {nbchanges: 2, version: 02} (mandatory: True) |
32623
ed566a59f660
strip: also backup obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32478
diff
changeset
|
1502 e016b03fd86fcccc54817d120b90b751aaf367d6 |
ed566a59f660
strip: also backup obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32478
diff
changeset
|
1503 b0551702f918510f01ae838ab03a463054c67b46 |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37841
diff
changeset
|
1504 cache:rev-branch-cache -- {} (mandatory: False) |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
37770
diff
changeset
|
1505 obsmarkers -- {} (mandatory: True) |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1506 version: 1 (92 bytes) |
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1507 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
37841
d618558e4e8b
debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents:
37770
diff
changeset
|
1508 phase-heads -- {} (mandatory: True) |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32743
diff
changeset
|
1509 b0551702f918510f01ae838ab03a463054c67b46 draft |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1510 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1511 $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1512 adding changesets |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1513 adding manifests |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1514 adding file changes |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1515 added 2 changesets with 2 changes to 2 files |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1516 1 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38239
diff
changeset
|
1517 new changesets e016b03fd86f:b0551702f918 (2 drafts) |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1518 (run 'hg update' to get a working copy) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1519 $ hg debugobsolete | sort |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1520 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1521 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1522 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
|
1523 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1524 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
|
1525 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1526 @ 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
|
1527 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1528 $ 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
|
1529 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
|
1530 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1531 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
|
1532 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1533 @ 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
|
1534 |
28845
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1535 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
|
1536 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
|
1537 $ hg init doindexrev |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1538 $ cd doindexrev |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1539 $ echo a > a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1540 $ hg ci -Am a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1541 adding a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1542 $ hg ci --amend -m aa |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1543 $ echo b > b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1544 $ hg ci -Am b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1545 adding b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1546 $ hg ci --amend -m bb |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1547 $ echo c > c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1548 $ hg ci -Am c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1549 adding c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1550 $ hg ci --amend -m cc |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1551 $ echo d > d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1552 $ hg ci -Am d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1553 adding d |
34870
64f29fff1877
config: rename stabilization.track-operation
Boris Feld <boris.feld@octobus.net>
parents:
34868
diff
changeset
|
1554 $ hg ci --amend -m dd --config experimental.evolution.track-operation=1 |
28845
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1555 $ hg debugobsolete --index --rev "3+7" |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1556 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1557 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1558 $ hg debugobsolete --index --rev "3+7" -Tjson |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1559 [ |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1560 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
1561 "date": [0, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1562 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1563 "index": 1, |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1564 "metadata": {"ef1": "1", "operation": "amend", "user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
1565 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1566 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1567 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1568 { |
37770
31750413f8d7
formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents:
37705
diff
changeset
|
1569 "date": [0, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1570 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1571 "index": 3, |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1572 "metadata": {"ef1": "1", "operation": "amend", "user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
1573 "prednode": "4715cf767440ed891755448016c2b8cf70760c30", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1574 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1575 } |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1576 ] |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1577 |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1578 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
|
1579 $ hg debugobsolete --index |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1580 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1581 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1582 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1583 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
28867
ffcc649a4e8f
debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents:
28845
diff
changeset
|
1584 $ hg debugobsolete --delete 1 --delete 3 |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
29795
diff
changeset
|
1585 deleted 2 obsolescence markers |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1586 $ hg debugobsolete |
34961
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1587 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
a7e49a5b3e6f
obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents:
34901
diff
changeset
|
1588 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
32389
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1589 |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1590 Test adding changeset after obsmarkers affecting it |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1591 (eg: during pull, or unbundle) |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1592 |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1593 $ mkcommit e |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1594 $ hg bundle -r . --base .~1 ../bundle-2.hg |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1595 1 changesets found |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1596 $ getid . |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1597 $ hg --config extensions.strip= strip -r . |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1598 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35094
diff
changeset
|
1599 saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg |
32389
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1600 $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1601 $ hg unbundle ../bundle-2.hg |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1602 adding changesets |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1603 adding manifests |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1604 adding file changes |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1605 added 1 changesets with 1 changes to 1 files |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1606 (1 other changesets obsolete on arrival) |
32389
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1607 (run 'hg update' to get a working copy) |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1608 $ hg log -G |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1609 @ 7:7ae79c5d60f0 (draft) [tip ] dd |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1610 | |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1611 | o 6:4715cf767440 (draft) [ ] d |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1612 |/ |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1613 o 5:29346082e4a9 (draft) [ ] cc |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1614 | |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1615 o 3:d27fb9b06607 (draft) [ ] bb |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1616 | |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1617 | o 2:6fdef60fcbab (draft) [ ] b |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1618 |/ |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1619 o 1:f9bd49731b0b (draft) [ ] aa |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1620 |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1621 |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1622 $ cd .. |
40081
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1623 |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1624 Test issue 5783 |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1625 |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1626 $ hg init issue-5783 --config format.obsstore-version=0 |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1627 $ cd issue-5783 |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1628 $ touch a.cpp |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1629 $ hg add a.cpp |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1630 $ hg commit -m 'Add a.cpp' |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1631 $ echo 'Hello' > a.cpp |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1632 $ hg amend -n 'Testing::Obsstore' --config format.obsstore-version=0 --config extensions.amend= |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1633 $ touch b.cpp |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1634 $ hg add b.cpp |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1635 $ hg commit -m 'Add b.cpp' |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1636 $ echo 'Hello' > b.cpp |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1637 $ hg amend -n 'Testing::Obsstore2' --config extensions.amend= |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1638 $ hg debugobsolete |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1639 d1b09fe3ad2b2a03e23a72f0c582e29a49570145 1a1a11184d2588af24e767e5335d5d9d07e8c550 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore', 'operation': 'amend', 'user': 'test'} |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1640 1bfd8e3868f641e048b6667cd672c68932f26d00 79959ca316d5b27ac6be1dd0cfd0843a5b5412eb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore2', 'operation': 'amend', 'user': 'test'} |
a4d62ff9a86d
obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents:
39900
diff
changeset
|
1641 $ cd .. |