view tests/test-sparse-merges.t @ 39313:3c4b2e880273

log: respect graphshorten on terminal nodes (collapsing o-~ to just o~)

Internally we have a custom template that's inspired by ones that we have seen
in the community. Normally, this looks something like:

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    |  cext: fix truncation warnings in revlog on Windows
    o  42cc76d0 matt_harbison
    |  cext: fix revlog compiler error on Windows
    ~
    o  bd63ada7 stable boris
    |  phases: drop dead code in `newheads`
    ~

With graphshorten on, and the descriptions of the public nodes hidden, it looks
like this, note that the commits right before the ~ are still "full height":

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    o  42cc76d0 matt_harbison
    |
    ~
    o  bd63ada7 stable boris
    |
    ~

This patch makes them look like this, removing the | but keeping the ~:

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    o  42cc76d0 matt_harbison
    ~
    o  bd63ada7 stable boris
    ~

This originally removed the ~s entirely, but this was determined to be too much
information loss and potentially confusing. This would have looked like the
following (note that the last commit is on a different branch than all of the
ones above it, and they are *not* linearly related):

    o  0834ec17 spectral tip
    |  crecord: support x to toggle single, X to toggle a range
    o  ee932990 spectral @
    |  filemerge: allow specifying $hgeditor as merge-tools.X.executable
    @  66f04611 matt_harbison
    o  42cc76d0 matt_harbison
    o  bd63ada7 stable boris

Differential Revision: https://phab.mercurial-scm.org/D4363

test merging things outside of the sparse checkout

  $ hg init myrepo
  $ cd myrepo
  $ cat > .hg/hgrc <<EOF
  > [extensions]
  > sparse=
  > EOF

  $ echo foo > foo
  $ echo bar > bar
  $ hg add foo bar
  $ hg commit -m initial

  $ hg branch feature
  marked working directory as branch feature
  (branches are permanent and global, did you want a bookmark?)
  $ echo bar2 >> bar
  $ hg commit -m 'feature - bar2'

  $ hg update -q default
  $ hg debugsparse --exclude 'bar**'

  $ hg merge feature
  temporarily included 1 file(s) in the sparse checkout for merging
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Verify bar was merged temporarily

  $ ls
  bar
  foo
  $ hg status
  M bar

Verify bar disappears automatically when the working copy becomes clean

  $ hg commit -m "merged"
  cleaned up 1 temporarily added file(s) from the sparse checkout
  $ hg status
  $ ls
  foo

  $ hg cat -r . bar
  bar
  bar2

Test merging things outside of the sparse checkout that are not in the working
copy

  $ hg strip -q -r . --config extensions.strip=
  $ hg up -q feature
  $ touch branchonly
  $ hg ci -Aqm 'add branchonly'

  $ hg up -q default
  $ hg debugsparse -X branchonly
  $ hg merge feature
  temporarily included 2 file(s) in the sparse checkout for merging
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

  $ cd ..

Tests merging a file which is modified in one branch and deleted in another and
file is excluded from sparse checkout

  $ hg init ytest
  $ cd ytest
  $ echo "syntax: glob" >> .hgignore
  $ echo "*.orig" >> .hgignore
  $ hg ci -Aqm "added .hgignore"
  $ for ch in a d; do echo foo > $ch; hg ci -Aqm "added "$ch; done;
  $ cat >> .hg/hgrc <<EOF
  > [alias]
  > glog = log -GT "{rev}:{node|short} {desc}"
  > [extensions]
  > sparse =
  > EOF

  $ hg glog
  @  2:f29feff37cfc added d
  |
  o  1:617125d27d6b added a
  |
  o  0:53f3774ed939 added .hgignore
  
  $ hg rm d
  $ hg ci -m "removed d"

  $ hg up '.^'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg debugsparse --reset
  $ echo bar >> d
  $ hg ci -Am "added bar to d"
  created new head

  $ hg glog
  @  4:6527874a90e4 added bar to d
  |
  | o  3:372c8558de45 removed d
  |/
  o  2:f29feff37cfc added d
  |
  o  1:617125d27d6b added a
  |
  o  0:53f3774ed939 added .hgignore
  
  $ hg debugsparse --exclude "d"
  $ ls
  a

  $ hg merge
  temporarily included 1 file(s) in the sparse checkout for merging
  file 'd' was deleted in other [merge rev] but was modified in local [working copy].
  What do you want to do?
  use (c)hanged version, (d)elete, or leave (u)nresolved? u
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]