mercurial-source: tests/test-addremove.t annotate

annotate tests/test-addremove.t @ 23427:3778884197f0

addremove: print relative paths when called with -I/-X (BC) For "hg addremove 'glob:*.py'", we print any paths added or removed as relative to the current directory, but when "hg addremove -I 'glob:*.py'" is used, we use the absolute path (relative from the repo root). It seems like they should be the same, so change it so we use relative paths in both cases. Continue to use absolute paths when no patterns are given.

author	Martin von Zweigbergk <martinvonz@google.com>
date	Mon, 01 Dec 2014 21:48:32 -0800
parents	9f4778027bc2
children	83bbedc16b3f

rev	line source
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	1 $ hg init rep
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	2 $ cd rep
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	3 $ mkdir dir
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	4 $ touch foo dir/bar
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	5 $ hg -v addremove
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	6 adding dir/bar
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	7 adding foo
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11850 diff changeset	8 $ hg -v commit -m "add 1"
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	9 dir/bar
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	10 foo
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11850 diff changeset	11 committed changeset 0:6f7f953567a2
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	12 $ cd dir/
16875 8017ac7a0e8f test-addremove: remove bits about con.xml Adrian Buehlmann <adrian@cadifra.com> parents: 15444 diff changeset	13 $ touch ../foo_2 bar_2
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	14 $ hg -v addremove
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	15 adding dir/bar_2
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	16 adding foo_2
12156 4c94b6d0fb1c tests: remove unneeded -d flags Martin Geisler <mg@lazybytes.net> parents: 11850 diff changeset	17 $ hg -v commit -m "add 2"
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	18 dir/bar_2
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	19 foo_2
16875 8017ac7a0e8f test-addremove: remove bits about con.xml Adrian Buehlmann <adrian@cadifra.com> parents: 15444 diff changeset	20 committed changeset 1:e65414bf35c5
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	21 $ cd ..
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	22 $ hg forget foo
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	23 $ hg -v addremove
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	24 adding foo
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	25 $ cd ..
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	26
23427 3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	27 $ hg init subdir
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	28 $ cd subdir
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	29 $ mkdir dir
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	30 $ cd dir
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	31 $ touch a.py
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	32 $ hg addremove 'glob:*.py'
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	33 adding a.py
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	34 $ hg forget a.py
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	35 $ hg addremove -I 'glob:*.py'
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	36 adding a.py
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	37 $ hg forget a.py
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	38 $ hg addremove
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	39 adding dir/a.py
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	40 $ cd ..
3778884197f0 addremove: print relative paths when called with -I/-X (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 23259 diff changeset	41
11850 54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	42 $ hg init sim
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	43 $ cd sim
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	44 $ echo a > a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	45 $ echo a >> a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	46 $ echo a >> a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	47 $ echo c > c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	48 $ hg commit -Ama
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	49 adding a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	50 adding c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	51 $ mv a b
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	52 $ rm c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	53 $ echo d > d
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	54 $ hg addremove -n -s 50 # issue 1696
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	55 removing a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	56 adding b
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	57 removing c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	58 adding d
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	59 recording removal of a as rename to b (100% similar)
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	60 $ hg addremove -s 50
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	61 removing a
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	62 adding b
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	63 removing c
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	64 adding d
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	65 recording removal of a as rename to b (100% similar)
54dbf16b401f tests: unify test-addremove Martin Geisler <mg@lazybytes.net> parents: 8990 diff changeset	66 $ hg commit -mb
23259 9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	67 $ cp b c
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	68 $ hg forget b
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	69 $ hg addremove -s 50
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	70 adding b
9f4778027bc2 addremove: add back forgotten files (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 16911 diff changeset	71 adding c
16911 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16875 diff changeset	72 $ cd ..

Mercurial > hg > mercurial-source

annotate tests/test-addremove.t @ 23427:3778884197f0