view tests/test-histedit-merge-tools.t @ 51756:a53162bd73ed

subrepo: drop the default value of None for the archive matcher

This was flagged by pytype after adding hints to `match.subdirmatcher` that it
takes a non-optional matcher.  That matcher argument is used without a guard in
the subdirmatcher constructor, so that's the correct restriction.

I don't think this fixes a bug in practice because the only way these are
invoked is either by a parent `hgsubrepo.archive()`, `archival.archive()`, or
the largefiles override of these.  The `hgsubrepo.archive()` case (and the
largefiles override) uses what the caller provided, so the caller will
eventually be `archival.archive()` (or the largfiles override) up the call
chain.  The `archival.archive()` method also has None for its matcher's default
arg.  However, the three callers of that (`commands.archive()`,
`webcommands.archive()`, and `extdiff.snapshot()`) all provide a matcher
argument, so the None case can never occur unless a 3rd party extension swaps it
for None.  Sadly, we can't make the argument on the `archival.archive()`
non-optional because there is a kwarg prior to it.

Even though the largefiles override of `archival.archive()` is provided a valid
matcher, we duplicate the internal creation of the matcher that the original
`archival.archive()` does for consistency.  By eliminating an impossible to hit
case, we can simplify some of the subrepo code too, by dropping unreachable
code.

Test histedit extension: Merge tools
====================================

Initialization
---------------

  $ . "$TESTDIR/histedit-helpers.sh"

  $ cat >> $HGRCPATH <<EOF
  > [alias]
  > logt = log --template '{rev}:{node|short} {desc|firstline}\n'
  > [extensions]
  > histedit=
  > mockmakedate = $TESTDIR/mockmakedate.py
  > EOF

Merge conflict
--------------

  $ hg init r
  $ cd r
  $ cat >> .hg/hgrc <<EOF
  > [command-templates]
  > pre-merge-tool-output='pre-merge message for {node}\n'
  > EOF

  $ echo foo > file
  $ hg add file
  $ hg ci -m "First" -d "1 0"
  $ echo bar > file
  $ hg ci -m "Second" -d "2 0"

  $ hg logt --graph
  @  1:2aa920f62fb9 Second
  |
  o  0:7181f42b8fca First
  

Invert the order of the commits, but fail the merge.
  $ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF | fixbundle
  > pick 2aa920f62fb9 Second
  > pick 7181f42b8fca First
  > EOF
  merging file
  pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
  merging file failed!
  Fix up the change (pick 7181f42b8fca)
  (hg histedit --continue to resume)

  $ hg histedit --abort | fixbundle
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

Invert the order of the commits, and pretend the merge succeeded.
  $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle
  > pick 2aa920f62fb9 Second
  > pick 7181f42b8fca First
  > EOF
  merging file
  pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
  7181f42b8fca: skipping changeset (no changes)
  $ hg histedit --abort
  abort: no histedit in progress
  [20]
  $ cd ..

Test legacy config name

  $ hg init r2
  $ cd r2
  $ echo foo > file
  $ hg add file
  $ hg ci -m "First"
  $ echo bar > file
  $ hg ci -m "Second"
  $ echo conflict > file
  $ hg co -m 0 --config ui.merge=false \
  > --config ui.pre-merge-tool-output-template='legacy config: {node}\n'
  merging file
  legacy config: 889c9c4d58bd4ce74815efd04a01e0f2bf6765a7
  merging file failed!
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges
  [1]