tests/test-debugrename.t
author Matt Harbison <matt_harbison@yahoo.com>
Fri, 31 Oct 2014 21:34:55 -0400
changeset 23150 aff73c777b0b
parent 12285 5d9bc49b0b1e
child 49621 55c6ebd11cb9
permissions -rw-r--r--
extdiff: allow a preconfigured merge-tool to be invoked There are three ways to configure an extdiff tool: 1) cmd.tool = (/path/to/exe optional) 2) tool = (path/to/exe optional) 3) tool = sometool someargs Previously, if no executable is specified in the first two forms, the named tool must be in $PATH, or the invocation fails. Since the [merge-tools] section already has the path to the diff executable, and/or the registry keys to find the executable on Windows, reuse that configuration for forms 1 and 2 instead of failing. We already fallback to [diff-tools] and then [merge-tools] for program arguments if they aren't specified in the [extdiff] section. Since this additional lookup only occurs if an executable is not on the $PATH for the named tool, this is backwards compatible. For now, we assume the user knows what he is doing if a path is provided. This change allows a configuration file like this (assuming beyondcompare3 is configured in merge-tools), instead of hardcoding system specific a path: [extdiff] beyondcompare3 =
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12285
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     1
  $ hg init
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     2
  $ echo a > a
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     3
  $ hg ci -Am t
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     4
  adding a
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     5
12285
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     6
  $ hg mv a b
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     7
  $ hg ci -Am t1
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     8
  $ hg debugrename b
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
     9
  b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    10
12285
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
    11
  $ hg mv b a
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
    12
  $ hg ci -Am t2
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
    13
  $ hg debugrename a
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
    14
  a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    15
12285
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
    16
  $ hg debugrename --rev 1 b
5d9bc49b0b1e tests: unify test-debugrename
Adrian Buehlmann <adrian@cadifra.com>
parents: 4637
diff changeset
    17
  b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
4637
5a088ac232e6 Add test for debugrename
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    18