Mercurial > hg
annotate tests/test-convert-datesort.t @ 26750:9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
Before this patch, external editor process for the commit log can't
view some in-memory changes (especially, of dirstate), because they
aren't written out until the end of transaction (or wlock).
This causes unexpected output of Mercurial commands spawned from that
editor process.
To make in-memory changes visible to external editor process, this
patch does:
- write (or schedule to write) in-memory dirstate changes, and
- set HG_PENDING environment variable, if:
- a transaction is running, and
- there are in-memory changes to be visible
"hg diff" spawned from external editor process for "hg qrefresh"
shows:
- "changes newly imported into the topmost" before 49148d7868df(*)
- "all changes recorded in the topmost by refreshing" after this patch
(*) 49148d7868df changed steps invoking editor process
Even though backward compatibility may be broken, the latter behavior
looks reasonable, because "hg diff" spawned from the editor process
consistently shows "what changes new revision records" regardless of
invocation context.
In fact, issue4378 itself should be resolved by 800e090e9c64, which
made 'repo.transaction()' write in-memory dirstate changes out
explicitly before starting transaction. It also made "hg qrefresh"
imply 'dirstate.write()' before external editor invocation in call
chain below.
- mq.queue.refresh
- strip.strip
- repair.strip
- localrepository.transaction
- dirstate.write
- localrepository.commit
- invoke external editor
Though, this patch has '(issue4378)' in own summary line to indicate
that issues like issue4378 should be fixed by this.
BTW, this patch adds '-m' option to a 'hg ci --amend' execution in
'test-commit-amend.t', to avoid invoking external editor process.
In this case, "unsure" states may be changed to "clean" according to
timestamp or so on. These changes should be written into pending file,
if external editor invocation is required,
Then, writing dirstate changes out breaks stability of test, because
it shows "transaction abort!/rollback completed" occasionally.
Aborting after editor process invocation while commands below may
cause similar instability of tests, too (AFAIK, there is no more such
one, at this revision)
- commit --amend
- without --message/--logfile
- import
- without --message/--logfile,
- without --no-commit,
- without --bypass,
- one of below, and
- patch has no description text, or
- with --edit
- aborting at the 1st patch, which adds or removes file(s)
- if it only changes existing files, status is checked only for
changed files by 'scmutil.matchfiles()', and transition from
"unsure" to "normal" in dirstate doesn't occur (= dirstate
isn't changed, and written out)
- aborting at the 2nd or later patch implies other pending
changes (e.g. changelog), and always causes showing
"transaction abort!/rollback completed"
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 17 Oct 2015 01:15:34 +0900 |
parents | 701df761aa94 |
children |
rev | line source |
---|---|
6100
49c69e1e4aa2
convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
2 $ cat >> $HGRCPATH <<EOF |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
3 > [extensions] |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
4 > convert= |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
5 > EOF |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
6 $ hg init t |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
7 $ cd t |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
8 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
9 $ hg ci -Am a0 -d '1 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
10 adding a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
11 $ hg branch brancha |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
12 marked working directory as branch brancha |
15615 | 13 (branches are permanent and global, did you want a bookmark?) |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
14 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
15 $ hg ci -m a1 -d '2 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
16 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
17 $ hg ci -m a2 -d '3 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
18 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
19 $ hg ci -m a3 -d '4 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
20 $ hg up -C 0 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
22 $ hg branch branchb |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
23 marked working directory as branch branchb |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
24 $ echo b >> b |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
25 $ hg ci -Am b0 -d '6 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
26 adding b |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
27 $ hg up -C brancha |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
28 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
29 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
30 $ hg ci -m a4 -d '5 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
31 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
32 $ hg ci -m a5 -d '7 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
33 $ echo a >> a |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
34 $ hg ci -m a6 -d '8 0' |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
35 $ hg up -C branchb |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
36 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
37 $ echo b >> b |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
38 $ hg ci -m b1 -d '9 0' |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
39 $ hg up -C 0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
41 $ echo c >> c |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
42 $ hg branch branchc |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
43 marked working directory as branch branchc |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
44 $ hg ci -Am c0 -d '10 0' |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
45 adding c |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
46 $ hg up -C brancha |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
47 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
48 $ hg ci --close-branch -m a7x -d '11 0' |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
49 $ hg up -C branchb |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
50 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
51 $ hg ci --close-branch -m b2x -d '12 0' |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
52 $ hg up -C branchc |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
53 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
54 $ hg merge branchb |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
55 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
56 (branch merge, don't forget to commit) |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
57 $ hg ci -m c1 -d '13 0' |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
58 $ cd .. |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
59 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
60 convert with datesort |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
61 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
62 $ hg convert --datesort t t-datesort |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
63 initializing destination t-datesort repository |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
64 scanning source... |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
65 sorting... |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
66 converting... |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
67 12 a0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
68 11 a1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
69 10 a2 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
70 9 a3 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
71 8 a4 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
72 7 b0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
73 6 a5 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
74 5 a6 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
75 4 b1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
76 3 c0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
77 2 a7x |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
78 1 b2x |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
79 0 c1 |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
80 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
81 graph converted repo |
6100
49c69e1e4aa2
convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
82 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18819
diff
changeset
|
83 $ hg -R t-datesort log -G --template '{rev} "{desc}"\n' |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
84 o 12 "c1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
85 |\ |
24216
4bb348ae43cb
log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20117
diff
changeset
|
86 | _ 11 "b2x" |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
87 | | |
24216
4bb348ae43cb
log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20117
diff
changeset
|
88 | | _ 10 "a7x" |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
89 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
90 o | | 9 "c0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
91 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
92 | o | 8 "b1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
93 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
94 | | o 7 "a6" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
95 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
96 | | o 6 "a5" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
97 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
98 | o | 5 "b0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
99 |/ / |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
100 | o 4 "a4" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
101 | | |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
102 | o 3 "a3" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
103 | | |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
104 | o 2 "a2" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
105 | | |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
106 | o 1 "a1" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
107 |/ |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
108 o 0 "a0" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
109 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
110 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
111 convert with datesort (default mode) |
6100
49c69e1e4aa2
convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
112 |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
113 $ hg convert t t-sourcesort |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
114 initializing destination t-sourcesort repository |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
115 scanning source... |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
116 sorting... |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
117 converting... |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
118 12 a0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
119 11 a1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
120 10 a2 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
121 9 a3 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
122 8 b0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
123 7 a4 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
124 6 a5 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
125 5 a6 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
126 4 b1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
127 3 c0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
128 2 a7x |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
129 1 b2x |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
130 0 c1 |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
131 |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
132 graph converted repo |
6100
49c69e1e4aa2
convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
133 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18819
diff
changeset
|
134 $ hg -R t-sourcesort log -G --template '{rev} "{desc}"\n' |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
135 o 12 "c1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
136 |\ |
24216
4bb348ae43cb
log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20117
diff
changeset
|
137 | _ 11 "b2x" |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
138 | | |
24216
4bb348ae43cb
log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20117
diff
changeset
|
139 | | _ 10 "a7x" |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
140 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
141 o | | 9 "c0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
142 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
143 | o | 8 "b1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
144 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
145 | | o 7 "a6" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
146 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
147 | | o 6 "a5" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
148 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
149 | | o 5 "a4" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
150 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
151 | o | 4 "b0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
152 |/ / |
12528
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
153 | o 3 "a3" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
154 | | |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
155 | o 2 "a2" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
156 | | |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
157 | o 1 "a1" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
158 |/ |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
159 o 0 "a0" |
f6b206417ba4
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com>
parents:
8692
diff
changeset
|
160 |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
161 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
162 convert with closesort |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
163 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
164 $ hg convert --closesort t t-closesort |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
165 initializing destination t-closesort repository |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
166 scanning source... |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
167 sorting... |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
168 converting... |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
169 12 a0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
170 11 a1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
171 10 a2 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
172 9 a3 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
173 8 b0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
174 7 a4 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
175 6 a5 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
176 5 a6 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
177 4 a7x |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
178 3 b1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
179 2 b2x |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
180 1 c0 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
181 0 c1 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
182 |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
183 graph converted repo |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
184 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18819
diff
changeset
|
185 $ hg -R t-closesort log -G --template '{rev} "{desc}"\n' |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
186 o 12 "c1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
187 |\ |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
188 | o 11 "c0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
189 | | |
24216
4bb348ae43cb
log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20117
diff
changeset
|
190 _ | 10 "b2x" |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
191 | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
192 o | 9 "b1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
193 | | |
24216
4bb348ae43cb
log: display closing-branch nodes as "_" (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20117
diff
changeset
|
194 | | _ 8 "a7x" |
18819
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
195 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
196 | | o 7 "a6" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
197 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
198 | | o 6 "a5" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
199 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
200 | | o 5 "a4" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
201 | | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
202 o | | 4 "b0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
203 |/ / |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
204 | o 3 "a3" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
205 | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
206 | o 2 "a2" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
207 | | |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
208 | o 1 "a1" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
209 |/ |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
210 o 0 "a0" |
05acdf8e1f23
convert: add closesort algorithm to mercurial sources
Constantine Linnick <theaspect@gmail.com>
parents:
15615
diff
changeset
|
211 |