Mercurial > hg
annotate tests/test-obsolete.t @ 34980:705d0f2bb677 stable
pathutil: add doctests for canonpath()
This is a followup to f445b10dc7fb. Since there's no way to ensure that more
drive letters than C: exist, this seems like the only way to test it. This is
enough to catch the f445b10dc7fb scenario, as well as CWD outside of the repo
when the path isn't prefixed with path/to/repo.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 03 Nov 2017 22:22:50 -0400 |
parents | ec765a71bd65 |
children | a7e49a5b3e6f |
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): |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
21 > ui.write('listkeys %s\n' % (namespace,)) |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
22 > return super(debugkeysrepo, self).listkeys(namespace) |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
23 > |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
24 > if repo.local(): |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
25 > repo.__class__ = debugkeysrepo |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
26 > EOF |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
27 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
28 $ hg init tmpa |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
29 $ cd tmpa |
17296
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
30 $ mkcommit kill_me |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
31 |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
32 Checking that the feature is properly disabled |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
33 |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
22950
bb8278b289ee
obsolete: add readonly flag to obstore constructor
Durham Goode <durham@fb.com>
parents:
22948
diff
changeset
|
35 abort: creating obsolete markers is not enabled on this repo |
17296
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
36 [255] |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
37 |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
38 Enabling it |
a1f8869f2eee
obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17292
diff
changeset
|
39 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
40 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
41 > [experimental] |
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 |
22177
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
65 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
66 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
|
67 (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
|
68 |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
69 $ 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
|
70 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
|
71 [255] |
a56038e6a3c9
obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
72 |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
73 $ cd .. |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
74 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
75 Killing a single changeset with replacement |
22948
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
76 (and testing the format option) |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
77 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
78 $ hg init tmpb |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
79 $ cd tmpb |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
80 $ mkcommit a |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
81 $ mkcommit b |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
82 $ mkcommit original_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
83 $ hg up "desc('b')" |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
84 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
|
85 $ mkcommit new_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
86 created new head |
17390
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
87 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
23094
32dbd1294ea7
tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23062
diff
changeset
|
88 $ 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
|
89 obsoleted 1 changesets |
17390
74b44f25b4b1
revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents:
17306
diff
changeset
|
90 $ 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
|
91 2:245bde4270cd add original_c |
21033
254f55b64e31
debugrevlog: use unfiltered view for changelog
Matt Mackall <mpm@selenic.com>
parents:
20807
diff
changeset
|
92 $ hg debugrevlog -cd |
22311
5038dee5bdd6
debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents:
22274
diff
changeset
|
93 # 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
|
94 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
|
95 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
|
96 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
|
97 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
|
98 $ 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
|
99 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
|
100 |
22948
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
101 (check for version number of the obsstore) |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
102 |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
103 $ 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
|
104 \x00 (no-eol) (esc) |
c136e26953aa
obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents:
22853
diff
changeset
|
105 |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
106 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
|
107 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
108 $ hg up '.^' |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
109 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
|
110 $ mkcommit new_2_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
111 created new head |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
112 $ 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
|
113 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
|
114 $ 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
|
115 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
|
116 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
|
117 |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
118 Register two markers with a missing node |
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 $ hg up '.^' |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
121 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
|
122 $ mkcommit new_3_c |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
123 created new head |
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
124 $ 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
|
125 obsoleted 1 changesets |
17071
11f26e2669aa
command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff
changeset
|
126 $ 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
|
127 $ 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
|
128 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
|
129 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
|
130 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
|
131 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
|
132 |
28613
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
133 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
|
134 $ hg debugobsolete --index |
6433da9c96a9
debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents:
28612
diff
changeset
|
135 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
|
136 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
|
137 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
|
138 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
|
139 |
17774
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
140 Refuse pathological nullid successors |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
141 $ 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
|
142 transaction abort! |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
143 rollback completed |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
144 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
|
145 [255] |
0496d4f73cf4
obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17390
diff
changeset
|
146 |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
147 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
|
148 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
149 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
150 @ 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
|
151 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
152 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
|
153 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
154 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
|
155 |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
156 |
18268
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
157 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
|
158 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
159 $ hg heads |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
160 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
|
161 $ hg heads --hidden |
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 |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
163 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
|
164 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
|
165 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
|
166 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
167 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
168 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
|
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 $ 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
|
171 $ 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
|
172 $ 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
|
173 $ 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
|
174 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
|
175 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
|
176 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
|
177 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
|
178 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25351
diff
changeset
|
179 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
|
180 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
|
181 |
ed25fe3a7e2f
clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18267
diff
changeset
|
182 $ 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
|
183 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
|
184 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
|
185 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
|
186 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
|
187 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
|
188 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
|
189 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
|
190 |
18423
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
191 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
|
192 |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
193 $ hg tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
194 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
|
195 $ 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
|
196 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
|
197 [255] |
5d6ee2494f63
clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18401
diff
changeset
|
198 $ hg log -r 4 |
23046
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
199 abort: hidden revision '4'! |
c1aede895072
repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23045
diff
changeset
|
200 (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
|
201 [255] |
23062
ba89f7b542c9
revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
Yuya Nishihara <yuya@tcha.org>
parents:
23046
diff
changeset
|
202 $ 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
|
203 $ 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
|
204 $ hg debugrevspec 'null' |
d2de20e1451f
revset: extend fullreposet to make "null" revision magically appears in set
Yuya Nishihara <yuya@tcha.org>
parents:
24162
diff
changeset
|
205 -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
|
206 |
17119
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
207 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
|
208 |
18267
5bb610f87d1d
clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18104
diff
changeset
|
209 $ hg --hidden phase --public 2 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
210 $ hg log -G |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
211 @ 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
|
212 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
213 | 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
|
214 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
215 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
|
216 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
217 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
|
218 |
2e13c1bd34dc
graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17075
diff
changeset
|
219 |
17829
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
220 And that bumped changeset are detected |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
221 -------------------------------------- |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
222 |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
223 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
|
224 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
|
225 the public changeset |
c73f7a28953c
revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17774
diff
changeset
|
226 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
227 $ hg log --hidden -r 'phasedivergent()' |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
228 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
|
229 |
17834
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
230 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
|
231 |
18085
4c53f015564f
test: fix truncated comment in test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18015
diff
changeset
|
232 $ 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
|
233 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
|
234 searching for changes |
18104
a2cebd3e4daa
clfilter: use filtering in `visibleheads`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18085
diff
changeset
|
235 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
|
236 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
|
237 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
|
238 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
|
239 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
|
240 $ hg push ../tmpa |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
241 pushing to ../tmpa |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
242 searching for changes |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
243 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
|
244 [255] |
743d04dd48ec
push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17833
diff
changeset
|
245 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
246 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
|
247 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
|
248 |
27385
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
249 $ hg summary |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
250 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
|
251 add new_3_c |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
252 branch: default |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
253 commit: (clean) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
254 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
|
255 phases: 1 draft |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
256 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
|
257 $ 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
|
258 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
|
259 $ 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
|
260 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
|
261 $ 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
|
262 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
|
263 $ 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
|
264 obsoleted 1 changesets |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
265 $ 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
|
266 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
267 @ 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
|
268 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
269 | 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
|
270 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
271 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
|
272 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
273 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
|
274 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
275 |
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
|
276 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
|
277 |
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
|
278 $ 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
|
279 @ 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
|
280 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
281 | 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
|
282 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
283 | 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
|
284 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
285 | 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
|
286 |/ |
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 | 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
|
288 |/ |
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 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
|
290 | |
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 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
|
292 |
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 $ 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
|
294 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
|
295 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
|
296 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
|
297 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
|
298 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
|
299 $ 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
|
300 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
|
301 $ 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
|
302 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
|
303 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
|
304 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
|
305 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
|
306 $ 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
|
307 $ 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
|
308 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
|
309 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
|
310 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
|
311 |
24681
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
312 $ cd .. |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
313 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
314 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
|
315 -------------------- |
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 $ hg init rev0hidden |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
318 $ cd rev0hidden |
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 $ mkcommit kill0 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
321 $ 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
|
322 $ hg debugobsolete `getid kill0` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
323 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
|
324 $ mkcommit a |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
325 $ mkcommit b |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
326 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
327 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
|
328 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
329 $ 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
|
330 $ 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
|
331 repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
332 node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
333 branch: default |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
334 latesttag: null |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
335 latesttagdistance: 2 |
33ab99a6ad9b
archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents:
24234
diff
changeset
|
336 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
|
337 |
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
338 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
339 $ cd .. |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
340 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
341 Exchange Test |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
342 ============================ |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
343 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
344 Destination repo does not have any data |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
345 --------------------------------------- |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
346 |
18493
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
347 Simple incoming test |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
348 |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
349 $ hg init tmpc |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
350 $ cd tmpc |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
351 $ hg incoming ../tmpb |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
352 comparing with ../tmpb |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
353 0:1f0dee641bb7 (public) [ ] add a |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
354 1:7c3bad9141dc (public) [ ] add b |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
355 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
356 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
|
357 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
358 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
|
359 (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
|
360 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
361 $ hg pull ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
362 pulling from ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
363 requesting all changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
364 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
365 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
366 adding file changes |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
367 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
|
368 5 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34425
diff
changeset
|
369 new changesets 1f0dee641bb7:6f9641995072 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
370 (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
|
371 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
372 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
|
373 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
|
374 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
|
375 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
|
376 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
|
377 |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
378 Rollback//Transaction support |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
379 |
8fa8717b47b6
obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17119
diff
changeset
|
380 $ 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
|
381 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
382 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
|
383 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
|
384 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
|
385 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
|
386 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
|
387 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
|
388 $ hg rollback -n |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
389 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
|
390 $ hg rollback |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
391 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
|
392 $ hg debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
393 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
|
394 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
|
395 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
|
396 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
|
397 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
|
398 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
399 $ cd .. |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
400 |
18492
45445187d286
test: minor documentation fix
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18464
diff
changeset
|
401 Try to push markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
402 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
403 $ hg init tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
404 $ hg -R tmpb push tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
405 pushing to tmpd |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
406 searching for changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
407 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
408 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
409 adding file changes |
17169
c18ecebed3f1
push: refuse to push obsolete changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17126
diff
changeset
|
410 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
|
411 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
|
412 $ 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
|
413 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
|
414 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
|
415 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
|
416 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
|
417 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
|
418 |
17252
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
419 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
|
420 |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
421 $ 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
|
422 $ 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
|
423 pushing to tmpd |
22019
9fcf772f15ff
push: perform phases discovery before the push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21978
diff
changeset
|
424 listkeys phases |
22239
0688010ee38f
push: move bookmark discovery with other discovery steps
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22220
diff
changeset
|
425 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
|
426 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
|
427 listkeys phases |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
428 [1] |
16fad7323e56
push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents:
17249
diff
changeset
|
429 |
17249
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
430 clone support |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
431 (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
|
432 |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
433 $ hg clone tmpb clone-dest |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
434 updating to branch default |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
435 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
|
436 $ 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
|
437 @ 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
|
438 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
439 | 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
|
440 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
441 | 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
|
442 |/ |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
443 | 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
|
444 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
445 | 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
|
446 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
447 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
|
448 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
449 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
|
450 |
7d4747c711a9
clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents:
17214
diff
changeset
|
451 $ 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
|
452 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
|
453 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
|
454 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
|
455 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
|
456 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
|
457 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
458 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
459 Destination repo have existing data |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
460 --------------------------------------- |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
461 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
462 On pull |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
463 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
464 $ hg init tmpe |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
465 $ 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
|
466 $ 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
|
467 $ hg pull ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
468 pulling from ../tmpb |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
469 requesting all changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
470 adding changesets |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
471 adding manifests |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
472 adding file changes |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
473 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
|
474 5 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34425
diff
changeset
|
475 new changesets 1f0dee641bb7:6f9641995072 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
476 (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
|
477 $ 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
|
478 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
|
479 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
|
480 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
|
481 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
|
482 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
|
483 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
|
484 |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
485 |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
486 On push |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
487 |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
488 $ hg push ../tmpc |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
489 pushing to ../tmpc |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
490 searching for changes |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
491 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
|
492 1 new obsolescence markers |
17075
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
493 [1] |
28ed1c4511ce
obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents:
17074
diff
changeset
|
494 $ hg -R ../tmpc debugobsolete |
25118
e632a2429982
obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
495 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
|
496 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
|
497 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
|
498 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
|
499 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
|
500 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
|
501 |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
502 detect outgoing obsolete and unstable |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
503 --------------------------------------- |
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
504 |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
505 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
506 $ hg log -G |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
507 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
|
508 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
509 | 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
|
510 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
511 o 1:7c3bad9141dc (public) [ ] add b |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
512 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
513 o 0:1f0dee641bb7 (public) [ ] add a |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
514 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
515 $ 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
|
516 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
|
517 $ mkcommit original_d |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
518 $ 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
|
519 $ 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
|
520 obsoleted 1 changesets |
22272
406181ee335f
debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22239
diff
changeset
|
521 $ 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
|
522 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
|
523 $ hg log -r 'obsolete()' |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
524 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
|
525 $ hg summary |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
526 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
|
527 add original_e |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
528 branch: default |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
529 commit: (clean) |
20e7de6205e7
summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents:
27319
diff
changeset
|
530 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
|
531 phases: 3 draft |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
532 orphan: 1 changesets |
33774
9dcc3529e002
revset: rename unstable into orphan
Boris Feld <boris.feld@octobus.net>
parents:
33773
diff
changeset
|
533 $ hg log -G -r '::orphan()' |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
534 @ 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
|
535 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
536 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
|
537 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
538 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
|
539 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
540 o 1:7c3bad9141dc (public) [ ] add b |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
541 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
542 o 0:1f0dee641bb7 (public) [ ] add a |
17171
9c750c3e4fac
obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17170
diff
changeset
|
543 |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
544 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
545 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
|
546 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
547 $ 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
|
548 pushing to ../tmpc/ |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
549 searching for changes |
17833
0c1185f6ddd7
obsolete: simplify push abort message
push includes an xxx changeset: yyyyyyyyyy
parents:
17831
diff
changeset
|
550 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
|
551 [255] |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
552 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
553 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
|
554 |
17172
12fdaa30063a
push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17171
diff
changeset
|
555 $ 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
|
556 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
|
557 searching for changes |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
558 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
|
559 [255] |
17173
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
560 |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
561 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
|
562 |
c621f84dbb35
obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17172
diff
changeset
|
563 $ 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
|
564 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
565 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
|
566 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
567 $ hg init ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
568 $ hg out ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
569 comparing with ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
570 searching for changes |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
571 0:1f0dee641bb7 (public) [ ] add a |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
572 1:7c3bad9141dc (public) [ ] add b |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
573 2:245bde4270cd (public) [ ] add original_c |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
574 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
|
575 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
|
576 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
|
577 $ 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
|
578 pushing to ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
579 searching for changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
580 adding changesets |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
581 adding manifests |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
582 adding file changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
583 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
|
584 7 new obsolescence markers |
17206
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
585 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
586 no warning displayed |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
587 |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
588 $ hg push ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
589 pushing to ../tmpf |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
590 searching for changes |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
591 no changes found |
70ebb4bd8083
obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
17173
diff
changeset
|
592 [1] |
17214
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
593 |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
594 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
|
595 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18684
diff
changeset
|
596 $ hg log -G |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
597 @ 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
|
598 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
599 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
|
600 | |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
601 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
|
602 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
603 | 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
|
604 |/ |
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
605 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
|
606 | |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
607 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
|
608 |
17831
70b08df24fef
obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17830
diff
changeset
|
609 $ 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
|
610 $ mkcommit obsolete_e |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
611 created new head |
32741
8f83f924ee1c
test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents:
32629
diff
changeset
|
612 $ 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
|
613 > -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
|
614 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
|
615 $ 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
|
616 comparing with ../tmpf |
fe67107094fd
discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18492
diff
changeset
|
617 searching for changes |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
618 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
|
619 $ hg push ../tmpf |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
620 pushing to ../tmpf |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
621 searching for changes |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
622 adding changesets |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
623 adding manifests |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
624 adding file changes |
738ad56dd8a6
checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17208
diff
changeset
|
625 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
|
626 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
|
627 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
|
628 |
22274
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
629 test relevance computation |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
630 --------------------------------------- |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
631 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
632 Checking simple case of "marker relevance". |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
633 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
634 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
635 Reminder of the repo situation |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
636 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
637 $ hg log --hidden --graph |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
638 @ 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
|
639 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
640 | 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
|
641 | | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
642 | 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
|
643 |/ |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
644 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
|
645 | |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
646 | 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
|
647 |/ |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
648 o 1:7c3bad9141dc (public) [ ] add b |
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 o 0:1f0dee641bb7 (public) [ ] add a |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
651 |
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 List of all markers |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
654 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
655 $ 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
|
656 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
|
657 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
|
658 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
|
659 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
|
660 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
|
661 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
|
662 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
|
663 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
|
664 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
665 List of changesets with no chain |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
666 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
667 $ hg debugobsolete --hidden --rev ::2 |
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 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
|
670 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
671 $ 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
|
672 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
|
673 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
674 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
|
675 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
676 $ hg debugobsolete --hidden --rev 3 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
677 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
|
678 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
685 List of both |
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 3::6 |
10e87c67f1c7
debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22272
diff
changeset
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 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
|
694 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
|
695 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
|
696 |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
697 List of all markers in JSON |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
698 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
699 $ hg debugobsolete -Tjson |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
700 [ |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
701 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
702 "date": [1339.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
703 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
704 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
705 "prednode": "1339133913391339133913391339133913391339", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
706 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
707 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
708 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
709 "date": [1339.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
710 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
711 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
712 "prednode": "1337133713371337133713371337133713371337", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
713 "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] |
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 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
716 "date": [121.0, 120], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
717 "flag": 12, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
718 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
719 "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
720 "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
721 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
722 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
723 "date": [1338.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
724 "flag": 1, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
725 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
726 "prednode": "5601fb93a350734d935195fee37f4054c529ff39", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
727 "succnodes": ["6f96419950729f3671185b847352890f074f7557"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
728 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
729 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
730 "date": [1338.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
731 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
732 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
733 "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
734 "succnodes": ["1337133713371337133713371337133713371337"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
735 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
736 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
737 "date": [1337.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
738 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
739 "metadata": {"user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
740 "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
741 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
742 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
743 { |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
744 "date": [0.0, 0], |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
745 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
746 "metadata": {"user": "test"}, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
747 "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
748 "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
749 "succnodes": [] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
750 }, |
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 "date": *, (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
753 "flag": 0, |
32743
f924dd043974
json: pass formatting options recursively
Yuya Nishihara <yuya@tcha.org>
parents:
32741
diff
changeset
|
754 "metadata": {"user": "test <test@example.net>"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
755 "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
756 "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
757 } |
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 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
760 Template keywords |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
761 |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
762 $ 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
|
763 3de5eca88c00 ????-??-?? (glob) |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
764 $ 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
|
765 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
|
766 $ 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
|
767 '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
|
768 '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
|
769 $ 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
|
770 3de5eca88c00aa039da7399a220f4a5221faa585 |
12bfecd0ffe6
formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents:
34286
diff
changeset
|
771 3de5eca88c00aa039da7399a220f4a5221faa585 |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
772 $ 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
|
773 0 test <test@example.net> |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
774 |
24733
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
775 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
|
776 ---------------------------------- |
c00e4338fa4b
obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24681
diff
changeset
|
777 |
29688
30c59bdd4f41
tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29657
diff
changeset
|
778 $ 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
|
779 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
|
780 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
|
781 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
|
782 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
|
783 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
784 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
|
785 ==================================== |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
786 |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
787 $ 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
|
788 adding changesets |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
789 adding manifests |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
790 adding file changes |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
791 added 62 changesets with 63 changes to 9 files (+60 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34425
diff
changeset
|
792 new changesets 50c51b361e60:c15e9edfca13 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
793 (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
|
794 $ 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
|
795 > do |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
796 > hg debugobsolete $node |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
797 > done |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
798 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
799 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
800 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
801 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
802 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
803 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
804 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
805 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
806 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
807 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
808 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
809 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
810 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
811 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
812 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
813 obsoleted 1 changesets |
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33515
diff
changeset
|
814 obsoleted 1 changesets |
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 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
858 $ hg up tip |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
859 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
|
860 |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
861 #if serve |
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
862 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
863 $ 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
|
864 $ 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
|
865 |
18426
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
866 check changelog view |
01638b51df44
hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18423
diff
changeset
|
867 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
868 $ 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
|
869 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
|
870 |
18428
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
871 check graph view |
8c10f760ca34
hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18426
diff
changeset
|
872 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
873 $ 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
|
874 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
|
875 |
18401
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
876 check filelog view |
683a76a07325
hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18268
diff
changeset
|
877 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
878 $ 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
|
879 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
|
880 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
881 $ 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
|
882 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
883 $ 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
|
884 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
|
885 [1] |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
886 |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
887 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
|
888 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
889 $ 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
|
890 $ 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
|
891 > [web] |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
892 > view=all |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
893 > EOF |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
894 $ wait |
36549fa712da
hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18506
diff
changeset
|
895 $ 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
|
896 $ 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
|
897 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
898 $ 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
|
899 |
17306
7d2967de2c04
obsolete: fix typos in comments introduced by 6955d69a52a4
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17297
diff
changeset
|
900 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
|
901 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
902 $ echo '[experimental]' >> $HGRCPATH |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
903 $ 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
|
904 $ hg log -r tip |
21978
c21c1c8c2017
test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21823
diff
changeset
|
905 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
|
906 |
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
907 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
|
908 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22950
diff
changeset
|
909 $ echo '[experimental]' >> $HGRCPATH |
34868
44797aedfb35
config: use 'experimental.evolution.exchange'
Boris Feld <boris.feld@octobus.net>
parents:
34866
diff
changeset
|
910 $ echo "evolution.exchange=True" >> $HGRCPATH |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
911 $ 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
|
912 |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
913 $ rm hg.pid access.log errors.log |
18506
ef60083b5536
tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents:
18493
diff
changeset
|
914 #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
|
915 |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
916 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
|
917 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
918 $ 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
|
919 obsoleted 1 changesets |
30711
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
920 $ hg debugobsolete `getid original_c` `getid babar` |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
921 $ 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
|
922 changeset: 7:50c51b361e60 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
923 user: test |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
924 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
|
925 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
|
926 summary: add babar |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
927 |
c03627d87d9d
test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30332
diff
changeset
|
928 |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
929 test the "obsolete" templatekw |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
930 |
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
931 $ hg log -r 'obsolete()' |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
932 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned] |
31699
568c4e7437b2
templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents:
30733
diff
changeset
|
933 |
30712
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
934 test the "troubles" templatekw |
5dde81de1e6d
templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30711
diff
changeset
|
935 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
936 $ hg log -r 'phasedivergent() and orphan()' |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
937 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
|
938 |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
939 test the default cmdline template |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
940 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
941 $ 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
|
942 changeset: 7:50c51b361e60 |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
943 user: test |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
944 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
|
945 instability: orphan, phase-divergent |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
946 summary: add babar |
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
947 |
31702
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
948 $ 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
|
949 changeset: 6:3de5eca88c00 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
950 parent: 3:6f9641995072 |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
951 user: test |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
952 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
|
953 obsolete: pruned |
31702
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
954 summary: add obsolete_e |
00f996f05522
templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents:
31699
diff
changeset
|
955 |
30713
6d0b1a69f98c
templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30712
diff
changeset
|
956 |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
957 test the obsolete labels |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
958 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
959 $ 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
|
960 [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
|
961 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
962 [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
|
963 [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
|
964 [log.summary|summary: add babar] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
965 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
966 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
967 $ 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
|
968 [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
|
969 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
970 [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
|
971 [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
|
972 [log.summary|summary: add babar] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
973 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
974 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
975 $ 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
|
976 [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
|
977 [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
|
978 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
979 [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
|
980 [log.obsfate|obsolete: pruned] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
981 [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
|
982 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
983 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
984 $ 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
|
985 [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
|
986 [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
|
987 [log.user|user: test] |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
988 [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
|
989 [log.obsfate|obsolete: pruned] |
33780
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
990 [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
|
991 |
2415ad743642
test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents:
33776
diff
changeset
|
992 |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
993 test summary output |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
994 |
33776
ed99d3afef88
revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents:
33774
diff
changeset
|
995 $ 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
|
996 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
|
997 $ hg summary |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
998 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
|
999 add babar |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1000 branch: default |
30733
66448a53bdac
test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents:
30715
diff
changeset
|
1001 commit: (clean) |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1002 update: 2 new changesets (update) |
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1003 phases: 4 draft |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
1004 orphan: 2 changesets |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1005 phase-divergent: 1 changesets |
31703
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1006 $ hg up -r 'obsolete()' |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1007 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
|
1008 $ hg summary |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1009 parent: 6:3de5eca88c00 (obsolete) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1010 add obsolete_e |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1011 branch: default |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1012 commit: (clean) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1013 update: 3 new changesets (update) |
cda83a1bfb3a
summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents:
31702
diff
changeset
|
1014 phases: 4 draft |
33667
03039ff3082b
evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
1015 orphan: 2 changesets |
33689
9c27a2891b75
evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents:
33667
diff
changeset
|
1016 phase-divergent: 1 changesets |
30715
7b526670f540
summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30713
diff
changeset
|
1017 |
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
|
1018 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
|
1019 =============================================================================== |
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
|
1020 |
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
|
1021 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
|
1022 |
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
|
1023 $ 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
|
1024 $ 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
|
1025 $ 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
|
1026 $ 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
|
1027 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
|
1028 $ 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
|
1029 $ 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
|
1030 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
|
1031 $ 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
|
1032 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
|
1033 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
|
1034 $ 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
|
1035 $ 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
|
1036 $ 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
|
1037 $ 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
|
1038 @ 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
|
1039 | |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1040 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
|
1041 |
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
|
1042 $ hg log -G -R ../repo-issue3805 |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1043 @ 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
|
1044 | |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1045 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
|
1046 |
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
|
1047 $ hg incoming |
18679
f6f35d646cb5
tests: append glob to filename output when required (windows)
Simon Heimberg <simohe@besonet.ch>
parents:
18617
diff
changeset
|
1048 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
1049 searching for changes |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1050 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
|
1051 $ hg incoming --bundle ../issue3805.hg |
18679
f6f35d646cb5
tests: append glob to filename output when required (windows)
Simon Heimberg <simohe@besonet.ch>
parents:
18617
diff
changeset
|
1052 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
1053 searching for changes |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1054 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
|
1055 $ hg outgoing |
18679
f6f35d646cb5
tests: append glob to filename output when required (windows)
Simon Heimberg <simohe@besonet.ch>
parents:
18617
diff
changeset
|
1056 comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
18568
cd403d6d96ef
incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18532
diff
changeset
|
1057 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
|
1058 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
|
1059 |
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
|
1060 #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
|
1061 |
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
|
1062 $ 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
|
1063 $ 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
|
1064 |
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
|
1065 $ 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
|
1066 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
|
1067 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
|
1068 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
|
1069 $ 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
|
1070 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
|
1071 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
|
1072 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
|
1073 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
1074 $ 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
|
1075 |
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
|
1076 #endif |
18617
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1077 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1078 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
|
1079 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1080 (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
|
1081 |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1082 $ cd .. |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1083 $ 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
|
1084 $ 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
|
1085 $ 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
|
1086 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
|
1087 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
|
1088 adding changesets |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1089 adding manifests |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1090 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
|
1091 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
|
1092 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
|
1093 $ 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
|
1094 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
|
1095 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
|
1096 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
|
1097 [1] |
227479f61db9
outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18568
diff
changeset
|
1098 |
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
|
1099 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
|
1100 |
27318
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1101 $ 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
|
1102 $ hg log -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1103 @ 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
|
1104 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1105 | 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
|
1106 |/ |
95a54824ab00
test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25569
diff
changeset
|
1107 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
|
1108 |
21823
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
1109 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
|
1110 |
925d1bb9a971
repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
21033
diff
changeset
|
1111 $ 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
|
1112 $ hg tags |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1113 tiptag 2:323a9c3ddd91 |
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1114 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
|
1115 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
|
1116 $ 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
|
1117 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
|
1118 $ 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
|
1119 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
|
1120 tip 1:29f0c6921ddd |
24113
b08af8f0ac01
localrepo: don't reintroduce pruned tag entries when tagging
Matt Harbison <matt_harbison@yahoo.com>
parents:
23632
diff
changeset
|
1121 |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1122 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
|
1123 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1124 $ cd .. |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1125 $ hg init repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1126 $ cd repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1127 $ echo "A" > foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1128 $ hg ci -Am "A" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1129 adding foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1130 $ echo "B" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1131 $ hg ci -m "B" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1132 $ hg up 0 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1133 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
|
1134 $ echo "C" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1135 $ hg ci -m "C" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1136 created new head |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1137 $ hg log -G |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1138 @ 2:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1139 | |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1140 | o 1:44526ebb0f98 (draft) [ ] B |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1141 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1142 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1143 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1144 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1145 $ hg clone -r1 . ../other-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1146 adding changesets |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1147 adding manifests |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1148 adding file changes |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1149 added 2 changesets with 2 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34425
diff
changeset
|
1150 new changesets 4b34ecfb0d56:44526ebb0f98 |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1151 updating to branch default |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1152 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
|
1153 $ cd ../other-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1154 $ echo "B+" >> foo |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1155 $ hg ci --amend -m "B+" |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1156 $ hg log -G --hidden |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1157 @ 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
|
1158 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1159 | 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
|
1160 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1161 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1162 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1163 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1164 $ 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
|
1165 comparing with ../repo-bundleoverlay |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1166 searching for changes |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1167 1:44526ebb0f98 (draft) [ ] B |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1168 2:c186d7714947 (draft) [tip ] C |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1169 $ hg log -G -R ../bundleoverlay.hg |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1170 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
|
1171 | |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1172 | @ 2:b7d587542d40 (draft) [ ] B+ |
24882
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1173 |/ |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1174 o 0:4b34ecfb0d56 (draft) [ ] A |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1175 |
995003a324da
bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents:
24733
diff
changeset
|
1176 |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1177 #if serve |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1178 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1179 Test issue 4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1180 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1181 $ cd .. |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1182 $ hg init repo-issue4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1183 $ cd repo-issue4506 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1184 $ echo "0" > foo |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1185 $ hg add foo |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1186 $ hg ci -m "content-0" |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1187 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1188 $ hg up null |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1189 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
|
1190 $ echo "1" > bar |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1191 $ hg add bar |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1192 $ hg ci -m "content-1" |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1193 created new head |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1194 $ hg up 0 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1195 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
|
1196 $ hg graft 1 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1197 grafting 1:1c9eddb02162 "content-1" (tip) |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1198 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1199 $ 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
|
1200 obsoleted 1 changesets |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1201 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1202 $ 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
|
1203 $ cat hg.pid >> $DAEMON_PIDS |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1204 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1205 $ 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
|
1206 404 Not Found |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1207 [1] |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1208 $ 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
|
1209 200 Script output follows |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
1210 $ 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
|
1211 200 Script output follows |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1212 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
1213 $ killdaemons.py |
24136
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1214 |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1215 #endif |
46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents:
24113
diff
changeset
|
1216 |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1217 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
|
1218 $ cd .. |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1219 $ 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
|
1220 > from __future__ import absolute_import |
a65f928e47d5
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33856
diff
changeset
|
1221 > from mercurial.i18n import _ |
32337
46ba2cdda476
registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
32327
diff
changeset
|
1222 > from mercurial import cmdutil, registrar |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1223 > |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1224 > cmdtable = {} |
32337
46ba2cdda476
registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
32327
diff
changeset
|
1225 > command = registrar.command(cmdtable) |
33097
fce4ed2912bb
py3: make sure commands name are bytes in tests
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33032
diff
changeset
|
1226 > @command(b"amendtransient",[], _('hg amendtransient [rev]')) |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1227 > def amend(ui, repo, *pats, **opts): |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1228 > opts['message'] = 'Test' |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1229 > opts['logfile'] = None |
34086
a39dce4a76b8
cmdutil: remove redundant commitfunc parameter in amend (API)
Saurabh Singh <singhsrb@fb.com>
parents:
34085
diff
changeset
|
1230 > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts) |
28612
6fb1d3c936d2
tests: explicitly flush output streams
Jun Wu <quark@fb.com>
parents:
28286
diff
changeset
|
1231 > ui.write('%s\n' % repo.changelog.headrevs()) |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1232 > EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1233 $ cat >> $HGRCPATH << EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1234 > [extensions] |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1235 > testextension=$TESTTMP/test_extension.py |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1236 > EOF |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1237 $ hg init repo-issue-nativerevs-pending-changes |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1238 $ cd repo-issue-nativerevs-pending-changes |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1239 $ mkcommit a |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1240 $ mkcommit b |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1241 $ hg up ".^" |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1242 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
|
1243 $ echo aa > a |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25118
diff
changeset
|
1244 $ hg amendtransient |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1245 [1, 2] |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1246 |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1247 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
|
1248 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
|
1249 bookmarks change |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1250 $ cd .. |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1251 $ 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
|
1252 > 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
|
1253 > import weakref |
33991
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1254 > from mercurial import ( |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1255 > bookmarks, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1256 > cmdutil, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1257 > extensions, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1258 > repoview, |
aaa65baf460c
tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33970
diff
changeset
|
1259 > ) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1260 > 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
|
1261 > reporef = weakref.ref(bkmstoreinst._repo) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1262 > def trhook(tr): |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1263 > repo = reporef() |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1264 > hidden1 = repoview.computehidden(repo) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1265 > hidden = repoview.filterrevs(repo, 'visible') |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1266 > 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
|
1267 > print("cache inconsistency") |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1268 > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1269 > orig(bkmstoreinst, *args, **kwargs) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1270 > def extsetup(ui): |
33515
3325c7dcabaa
bookmark: deprecate 'recordchange' in favor of 'applychanges'
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1271 > 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
|
1272 > _bookmarkchanged) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1273 > EOF |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1274 |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1275 $ hg init repo-cache-inconsistency |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1276 $ cd repo-issue-nativerevs-pending-changes |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1277 $ mkcommit a |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1278 a already tracked! |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1279 $ mkcommit b |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1280 $ hg id |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1281 13bedc178fce tip |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1282 $ echo "hello" > b |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1283 $ hg commit --amend -m "message" |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1284 $ hg book bookb -r 13bedc178fce --hidden |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1285 $ hg log -r 13bedc178fce |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1286 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
|
1287 $ hg book -d bookb |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1288 $ hg log -r 13bedc178fce |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1289 abort: hidden revision '13bedc178fce'! |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1290 (use --hidden to access hidden revisions) |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1291 [255] |
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1292 |
29065
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1293 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
|
1294 of the test. |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1295 $ echo > $TESTTMP/test_extension.py |
dae4552390fc
test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents:
28867
diff
changeset
|
1296 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1297 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
|
1298 (issue4945) |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1299 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1300 $ cd .. |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1301 $ hg init issue4845 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1302 $ cd issue4845 |
25569
2612e6dab189
repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents:
25474
diff
changeset
|
1303 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1304 $ echo foo > f0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1305 $ hg add f0 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1306 $ 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
|
1307 $ echo foo > f1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1308 $ hg add f1 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1309 $ 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
|
1310 $ echo foo > f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1311 $ hg add f2 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1312 $ 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
|
1313 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1314 $ echo bar > f2 |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34853
diff
changeset
|
1315 $ 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
|
1316 $ hg log -G |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1317 @ 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
|
1318 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1319 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
|
1320 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1321 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
|
1322 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1323 $ hg log -G --hidden |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1324 @ 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
|
1325 | |
34851
6f53a53245a2
obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents:
34850
diff
changeset
|
1326 | 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
|
1327 |/ |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1328 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
|
1329 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1330 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
|
1331 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1332 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1333 $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1334 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg (glob) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1335 $ hg debugobsolete |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1336 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'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
|
1337 $ hg log -G |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1338 @ 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
|
1339 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1340 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
|
1341 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1342 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
|
1343 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1344 $ 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
|
1345 @ 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
|
1346 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1347 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
|
1348 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1349 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
|
1350 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1351 $ 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
|
1352 Stream params: {Compression: BZ} |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1353 changegroup -- {nbchanges: 1, version: 02} |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1354 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33991
diff
changeset
|
1355 phase-heads -- {} |
34085
e8a7c1a0565a
cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents:
34025
diff
changeset
|
1356 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1357 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1358 $ 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
|
1359 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
|
1360 searching for changes |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1361 no changes found |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1362 $ hg debugobsolete |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1363 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'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
|
1364 $ hg log -G |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1365 @ 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
|
1366 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1367 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
|
1368 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1369 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
|
1370 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1371 $ 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
|
1372 @ 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
|
1373 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1374 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
|
1375 | |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1376 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
|
1377 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1378 |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1379 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
|
1380 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1381 $ 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
|
1382 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1383 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg (glob) |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1384 $ hg debugobsolete |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1385 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1386 @ 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
|
1387 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1388 $ 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
|
1389 @ 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
|
1390 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1391 $ 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
|
1392 Stream params: {Compression: BZ} |
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33991
diff
changeset
|
1393 changegroup -- {nbchanges: 2, version: 02} |
32623
ed566a59f660
strip: also backup obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32478
diff
changeset
|
1394 e016b03fd86fcccc54817d120b90b751aaf367d6 |
ed566a59f660
strip: also backup obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32478
diff
changeset
|
1395 b0551702f918510f01ae838ab03a463054c67b46 |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33991
diff
changeset
|
1396 obsmarkers -- {} |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1397 version: 1 (86 bytes) |
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1398 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
34025
626a28f30dbd
debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents:
33991
diff
changeset
|
1399 phase-heads -- {} |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32743
diff
changeset
|
1400 b0551702f918510f01ae838ab03a463054c67b46 draft |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1401 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32626
diff
changeset
|
1402 $ 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
|
1403 adding changesets |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1404 adding manifests |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1405 adding file changes |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1406 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
|
1407 1 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34425
diff
changeset
|
1408 new changesets e016b03fd86f:b0551702f918 |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1409 (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
|
1410 $ hg debugobsolete | sort |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1411 e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'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
|
1412 $ hg log -G |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1413 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
|
1414 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1415 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
|
1416 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1417 @ 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
|
1418 |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1419 $ 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
|
1420 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
|
1421 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1422 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
|
1423 | |
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1424 @ 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
|
1425 |
28845
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1426 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
|
1427 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
|
1428 $ hg init doindexrev |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1429 $ cd doindexrev |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1430 $ echo a > a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1431 $ hg ci -Am a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1432 adding a |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1433 $ hg ci --amend -m aa |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1434 $ echo b > b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1435 $ hg ci -Am b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1436 adding b |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1437 $ hg ci --amend -m bb |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1438 $ echo c > c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1439 $ hg ci -Am c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1440 adding c |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1441 $ hg ci --amend -m cc |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1442 $ echo d > d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1443 $ hg ci -Am d |
5a398627db92
commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents:
28795
diff
changeset
|
1444 adding d |
34870
64f29fff1877
config: rename stabilization.track-operation
Boris Feld <boris.feld@octobus.net>
parents:
34868
diff
changeset
|
1445 $ 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
|
1446 $ hg debugobsolete --index --rev "3+7" |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1447 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
32327
3546a771e376
obsolete: add operation metadata to rebase/amend/histedit obsmarkers
Durham Goode <durham@fb.com>
parents:
31703
diff
changeset
|
1448 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1449 $ hg debugobsolete --index --rev "3+7" -Tjson |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1450 [ |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1451 { |
32411
08d02c1d7e67
devel: use default-date config field when creating obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
32389
diff
changeset
|
1452 "date": [0.0, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1453 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1454 "index": 1, |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1455 "metadata": {"operation": "amend", "user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
1456 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1457 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1458 }, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1459 { |
32411
08d02c1d7e67
devel: use default-date config field when creating obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
32389
diff
changeset
|
1460 "date": [0.0, 0], |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1461 "flag": 0, |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1462 "index": 3, |
32327
3546a771e376
obsolete: add operation metadata to rebase/amend/histedit obsmarkers
Durham Goode <durham@fb.com>
parents:
31703
diff
changeset
|
1463 "metadata": {"operation": "amend", "user": "test"}, |
33856
eae63a9e59da
obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents:
33783
diff
changeset
|
1464 "prednode": "4715cf767440ed891755448016c2b8cf70760c30", |
29795
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1465 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1466 } |
142ae01820a3
debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents:
29688
diff
changeset
|
1467 ] |
28220
0209bdd553b9
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27917
diff
changeset
|
1468 |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1469 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
|
1470 $ hg debugobsolete --index |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1471 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1472 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1473 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
32411
08d02c1d7e67
devel: use default-date config field when creating obsmarkers
Boris Feld <boris.feld@octobus.net>
parents:
32389
diff
changeset
|
1474 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'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
|
1475 $ hg debugobsolete --delete 1 --delete 3 |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
29795
diff
changeset
|
1476 deleted 2 obsolescence markers |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1477 $ hg debugobsolete |
34286
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1478 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
ecc96506c49d
obsmarker: track operation by default
Martin von Zweigbergk <martinvonz@google.com>
parents:
34086
diff
changeset
|
1479 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
32389
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1480 |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1481 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
|
1482 (eg: during pull, or unbundle) |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1483 |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1484 $ mkcommit e |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1485 $ 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
|
1486 1 changesets found |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1487 $ getid . |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1488 $ 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
|
1489 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1490 saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob) |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1491 $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1492 $ hg unbundle ../bundle-2.hg |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1493 adding changesets |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1494 adding manifests |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1495 adding file changes |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1496 added 1 changesets with 1 changes to 1 files |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1497 (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
|
1498 $ hg log -G |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1499 @ 7:7ae79c5d60f0 (draft) [tip ] dd |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1500 | |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1501 | o 6:4715cf767440 (draft) [ ] d |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1502 |/ |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1503 o 5:29346082e4a9 (draft) [ ] cc |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1504 | |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1505 o 3:d27fb9b06607 (draft) [ ] bb |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1506 | |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1507 | o 2:6fdef60fcbab (draft) [ ] b |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1508 |/ |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1509 o 1:f9bd49731b0b (draft) [ ] aa |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1510 |
4e51b2a99847
obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32354
diff
changeset
|
1511 |
28795
f456834b2f7e
commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents:
28613
diff
changeset
|
1512 $ cd .. |