Mercurial > hg
annotate tests/test-revlog-packentry.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | 6cc1f388ac80 |
children | 009d0283de5f |
rev | line source |
---|---|
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
1 $ hg init repo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
2 $ cd repo |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
4 $ touch foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
5 $ hg ci -Am 'add foo' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
6 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
7 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
8 $ hg up -C null |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
9 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
11 this should be stored as a delta against rev 0 |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
13 $ echo foo bar baz > foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
14 $ hg ci -Am 'add foo again' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
15 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
16 created new head |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
11919
diff
changeset
|
18 $ hg debugindex foo |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
19 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
20 0 0 0 ..... 0 b80de5d13875 000000000000 000000000000 (re) |
23285
6cc1f388ac80
revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents:
17132
diff
changeset
|
21 1 0 13 ..... 1 0376abec49b8 000000000000 000000000000 (re) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
22 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
14182
diff
changeset
|
23 $ cd .. |