tests/test-empty-dir.t
author Durham Goode <durham@fb.com>
Tue, 07 Mar 2017 16:30:31 -0800
changeset 31235 749b057b01f3
parent 12346 3b165c127690
permissions -rw-r--r--
rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     1
  $ hg init
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     2
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     3
  $ echo 123 > a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     4
  $ hg add a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     5
  $ hg commit -m "first" a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     6
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     7
  $ mkdir sub
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     8
  $ echo 321 > sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
     9
  $ hg add sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    10
  $ hg commit -m "second" sub/b
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    11
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    12
  $ cat sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    13
  321
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    14
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    15
  $ hg co 0
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    16
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    17
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    18
  $ cat sub/b 2>/dev/null || echo "sub/b not present"
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    19
  sub/b not present
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    20
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    21
  $ test -d sub || echo "sub not present"
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    22
  sub not present
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
    23