tests/test-debugindexdot.t
author Matt Harbison <matt_harbison@yahoo.com>
Wed, 03 Jun 2015 14:21:15 -0400
changeset 25418 c0995cd8ff6f
parent 17490 a03c3ba3e4b5
child 37282 435481393198
permissions -rw-r--r--
scmutil: consistently return subrepos relative to ctx1 from itersubrepos() Previously, if a subrepo was added in ctx2 and then compared to another without it (ctx1), the subrepo for ctx2 was returned amongst all of the ctx1 based subrepos, since no subrepo exists in ctx1 to replace it in the 'subpaths' dict. The two callers of this, basectx.status() and cmdutil.diffordiffstat(), both compare the yielded subrepo against ctx2, and thus saw no changes when ctx2's subrepo was returned. The tests here previously didn't mention 's/a' for the 'p1()' case. This appears to have been a known issue, because some diffordiffstat() comments mention that the subpath disappeared, and "the best we can do is ignore it". I originally ran into the issue with some custom convert code to flatten a tree of subrepos causing hg.putcommit() to abort, but this new behavior seems like the correct status and diff behavior regardless. (The abort in convert isn't something users will see, because convert doesn't currently support subrepos in the official repo.)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17490
a03c3ba3e4b5 spelling: exercise
timeless@mozdev.org
parents: 16913
diff changeset
     1
Just exercise debugindexdot
11923
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     2
Create a short file history including a merge.
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     3
  $ hg init t
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     4
  $ cd t
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     5
  $ echo a > a
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     6
  $ hg ci -qAm t1 -d '0 0'
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     7
  $ echo a >> a
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     8
  $ hg ci -m t2 -d '1 0'
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
     9
  $ hg up -qC 0
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    10
  $ echo b >> a
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    11
  $ hg ci -m t3 -d '2 0'
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    12
  created new head
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    13
  $ HGMERGE=true hg merge -q
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    14
  $ hg ci -m merge -d '3 0'
5346
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    15
11923
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    16
  $ hg debugindexdot .hg/store/data/a.i
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    17
  digraph G {
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    18
  	-1 -> 0
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    19
  	0 -> 1
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    20
  	0 -> 2
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    21
  	2 -> 3
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    22
  	1 -> 3
be74ba87acaf tests: unify tests-debugindexdot
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5346
diff changeset
    23
  }
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11923
diff changeset
    24
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11923
diff changeset
    25
  $ cd ..