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