##// END OF EJS Templates
chainsaw-update: log actual locks breaking...
Georges Racinet -
r52324:fe68a2dc default
parent child Browse files
Show More
@@ -120,9 +120,10 b' def update(ui, repo, **opts):'
120 raise error.InputError(_(b'specify a target revision with --rev'))
120 raise error.InputError(_(b'specify a target revision with --rev'))
121 if not source:
121 if not source:
122 raise error.InputError(_(b'specify a pull path with --source'))
122 raise error.InputError(_(b'specify a pull path with --source'))
123 ui.status(_(b'breaking locks, if any\n'))
123 if repo.svfs.tryunlink(b'lock'):
124 repo.svfs.tryunlink(b'lock')
124 ui.status(_(b'had to break store lock\n'))
125 repo.vfs.tryunlink(b'wlock')
125 if repo.vfs.tryunlink(b'wlock'):
126 ui.status(_(b'had to break working copy lock\n'))
126
127
127 ui.status(_(b'recovering after interrupted transaction, if any\n'))
128 ui.status(_(b'recovering after interrupted transaction, if any\n'))
128 repo.recover()
129 repo.recover()
@@ -26,7 +26,6 b' Simple invocation'
26 $ hg init repo
26 $ hg init repo
27 $ cd repo
27 $ cd repo
28 $ hg admin::chainsaw-update --rev default --source ../src
28 $ hg admin::chainsaw-update --rev default --source ../src
29 breaking locks, if any
30 recovering after interrupted transaction, if any
29 recovering after interrupted transaction, if any
31 no interrupted transaction available
30 no interrupted transaction available
32 pulling from ../src
31 pulling from ../src
@@ -51,8 +50,15 b' from the current hostname (happens a lot'
51 wlock: (.*?), process 171814, host invalid.host.test/effffffc \((\d+)s\) (re)
50 wlock: (.*?), process 171814, host invalid.host.test/effffffc \((\d+)s\) (re)
52 [2]
51 [2]
53
52
54 $ hg admin::chainsaw-update --no-purge-ignored --rev default --source ../src -q
53 $ hg admin::chainsaw-update --no-purge-ignored --rev default --source ../src
54 had to break store lock
55 had to break working copy lock
56 recovering after interrupted transaction, if any
55 no interrupted transaction available
57 no interrupted transaction available
58 pulling from ../src
59 updating to revision 'default'
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 chainsaw-update to revision 'default' for repository at '$TESTTMP/repo' done
56
62
57 Test file purging capabilities
63 Test file purging capabilities
58 ------------------------------
64 ------------------------------
General Comments 0
You need to be logged in to leave comments. Login now