view tests/test-notify-changegroup.t @ 24787:9d5c27890790

largefiles: for update -C, only update largefiles when necessary Before, a --clean update with largefiles would use the "optimization" that it didn't read hashes from standin files before and after the update. Instead of trusting the content of the standin files, it would rehash all the actual largefiles that lfdirstate reported clean and update the standins that didn't have the expected content. It could thus in some "impossible" situations automatically recover from some "largefile got out sync with its standin" issues (even there apparently still were weird corner cases where it could fail). This extra checking is similar to what core --clean intentionally do not do, and it made update --clean unbearable slow. Usually in core Mercurial, --clean will rely on the dirstate to find the files it should update. (It is thus intentionally possible (when trying to trick the system or if there should be bugs) to end up in situations where --clean not will restore the working directory content correctly.) Checking every file when we "know" it is ok is however not an option - that would be too slow. Instead, trust the content of the standin files. Use the same logic for --clean as for linear updates and trust the dirstate and that our "logic" will keep them in sync. It is much cheaper to just rehash the largefiles reported dirty by a status walk and read all standins than to hash largefiles. Most of the changes are just a change of indentation now when the different kinds of updates no longer are handled that differently. Standins for added files are however only written when doing a normal update, while deleted and removed files only will be updated for --clean updates.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 15 Apr 2015 15:22:16 -0400
parents c63a09b6b337
children 24849d53697d
line wrap: on
line source


  $ cat <<EOF >> $HGRCPATH
  > [extensions]
  > notify=
  > 
  > [hooks]
  > changegroup.notify = python:hgext.notify.hook
  > 
  > [notify]
  > sources = push
  > diffstat = False
  > maxsubject = 10
  > 
  > [usersubs]
  > foo@bar = *
  > 
  > [reposubs]
  > * = baz
  > EOF
  $ hg init a

clone

  $ hg --traceback clone a b
  updating to branch default
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo a > b/a

commit

  $ hg --traceback --cwd b commit -Ama
  adding a
  $ echo a >> b/a

commit

  $ hg --traceback --cwd b commit -Amb

push

  $ hg --traceback --cwd b push ../a 2>&1 |
  >     $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
  pushing to ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  Content-Type: text/plain; charset="us-ascii"
  MIME-Version: 1.0
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: * (glob)
  From: test
  X-Hg-Notification: changeset cb9a9f314b8b
  Message-Id: <*> (glob)
  To: baz, foo@bar
  
  changeset cb9a9f314b8b in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
  summary: a
  
  changeset ba677d0156c1 in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
  summary: b
  
  diffs (6 lines):
  
  diff -r 000000000000 -r ba677d0156c1 a
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,2 @@
  +a
  +a
  $ hg --cwd a rollback
  repository tip rolled back to revision -1 (undo push)

unbundle with unrelated source

  $ hg --cwd b bundle ../test.hg ../a
  searching for changes
  2 changesets found
  $ hg --cwd a unbundle ../test.hg
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  (run 'hg update' to get a working copy)
  $ hg --cwd a rollback
  repository tip rolled back to revision -1 (undo unbundle)

unbundle with correct source

  $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
  >     $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  Content-Type: text/plain; charset="us-ascii"
  MIME-Version: 1.0
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: * (glob)
  From: test
  X-Hg-Notification: changeset cb9a9f314b8b
  Message-Id: <*> (glob)
  To: baz, foo@bar
  
  changeset cb9a9f314b8b in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
  summary: a
  
  changeset ba677d0156c1 in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
  summary: b
  
  diffs (6 lines):
  
  diff -r 000000000000 -r ba677d0156c1 a
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,2 @@
  +a
  +a
  (run 'hg update' to get a working copy)

Check that using the first committer as the author of a changeset works:
Check that the config option works.
Check that the first committer is indeed used for "From:".
Check that the merge user is NOT used for "From:"

Create new file

  $ echo a > b/b
  $ echo b >> b/b
  $ echo c >> b/b
  $ hg --traceback --cwd b commit -Amnewfile -u committer_1
  adding b

commit as one user

  $ echo x > b/b
  $ echo b >> b/b
  $ echo c >> b/b
  $ hg --traceback --cwd b commit -Amx -u committer_2

commit as other user, change file so we can do an (automatic) merge

  $ hg --cwd b up 2
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo a > b/b
  $ echo b >> b/b
  $ echo y >> b/b
  $ hg --traceback --cwd b commit -Amy -u committer_3
  created new head

merge as a different user

  $ hg --cwd b merge --config notify.fromauthor=True
  merging b
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

  $ hg --traceback --cwd b commit -Am "merged"

push

  $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
  >     $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
  pushing to ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 4 changesets with 4 changes to 1 files
  Content-Type: text/plain; charset="us-ascii"
  MIME-Version: 1.0
  Content-Transfer-Encoding: 7bit
  Date: * (glob)
  Subject: * (glob)
  From: committer_1
  X-Hg-Notification: changeset 84e487dddc58
  Message-Id: <*> (glob)
  To: baz, foo@bar
  
  changeset 84e487dddc58 in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
  summary: newfile
  
  changeset b29c7a2b6b0c in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
  summary: x
  
  changeset 0957c7d64886 in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
  summary: y
  
  changeset 485b4e6b0249 in $TESTTMP/a (glob)
  details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
  summary: merged
  
  diffs (7 lines):
  
  diff -r ba677d0156c1 -r 485b4e6b0249 b
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,3 @@
  +x
  +b
  +y
  $ hg --cwd a rollback
  repository tip rolled back to revision 1 (undo push)