tests/test-revlog-packentry.t
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 05 Nov 2014 23:24:47 +0900
changeset 23183 51c9196a6bd0
parent 17132 b87acfda5268
child 23285 6cc1f388ac80
permissions -rw-r--r--
largefiles: remove meaningless code path for "hg pull --rebase" This patch removes "--rebase" specific code path for "hg pull" in "overridepull", because previous patch makes it meaningless: now, "rebase.rebase" ("orig" invocation in this patch) can update/commit largefiles safely without "repo._isrebasing = True". As a side effect of removing "rebase.rebase" invocation in "overridepull", this patch removes "nothing to rebase ..." message in "test-largefiles.t", which is shown only when rebase extension is enabled AFTER largefiles: before this patch: 1. "dispatch" invokes "pullrebase" of rebase as "hg pull" at first, because rebase wraps "hg pull" later 2. "pullrebase" invokes "overridepull" of largefiles as "orig", even though rebase assumes that "orig" is "pull" of commands 3. "overridepull" executes "pull" and "rebase" directly 3.1 "pull" pulls changesets and creates new head "X" 3.2 "rebase" rebases current working parent "Y" on "X" 4. "overridepull" returns to "pullrebase" 5. "pullrebase" tries to rebase, but there is nothing to be done, because "Y" is already rebased on "X". then, it shows "nothing to rebase ..." after this patch: 1. "dispatch" invokes "pullrebase" of rebase as "hg pull" 2. "pullrebase" invokes "overridepull" of largefiles as "orig" 3. "overridepull" executes "pull" as "orig" 4. "overridepull" returns to "pullrebase" 5. revision "Y" is not yet rebased, so "pullrebase" doesn't shows "nothing to rebase ..." As another side effect of removing "rebase.rebase" invocation, this patch fixes issue3861, which occurs only when rebase extension is enabled BEFORE largefiles: before this patch: 1. "dispatch" invokes "overridepull" of largefiles at first, because largefiles wrap "hg pull" later 2. "overridepull" executes "pull" and "rebase" explicitly 2.1 "pull" pulls changesets and creates new head "X" 2.2 "rebase" rebases current working parent, but fails because no revision is checked out in issue3861 case 3. "overridepull" returns to "dispatch" with exit code 1 returned from "rebase" at (2.2) 4. "hg pull" terminates with exit code 1 unexpectedly after this patch: 1. "dispatch" invokes "overridepull" of largefiles at first 2. "overridepull" invokes "pullrebase" of rebase as "orig" 3. "pullrebase" invokes "pull" as "orig" 4. "pullrebase" invokes "rebase", and it fails 5. "pullrebase" returns to "overridepull" with exit code 0 (because "pullrebase" ignores result of "pull" and "rebase") 6. "overridepull" returns to "dispatch" with exit code 0 returned from "rebase" at (5) 7. "hg pull" terminates with exit code 0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
b87acfda5268 tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents: 16913
diff changeset
    21
       1         0      24  .....       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 ..