Issue1810

Title fetch extension complains about uncommited local changes when there are none
Priority bug Status done-cbb
Superseder Nosy List djc, moist, nicdumz
Assigned To nicdumz Topics inotify

Created on 2009-08-24.14:33:17 by moist, last changed 2011-10-25.22:56:11 by mpm.

Messages
msg10959 (view) Author: nicdumz Date: 2009-11-13.05:45:42
issue1811 should soon be solved in crew (
http://www.selenic.com/pipermail/mercurial-devel/2009-November/016667.html ). 

As I wrote in that email, this issue is now a manifestation of a regression
cause by:

changeset:   9515:7c01599dd340
user:        Nicolas Dumazet <nicdumz.commits@gmail.com>
date:        Sun Aug 16 11:11:37 2009 +0900
summary:     inotify: use cmdutil.service instead of local daemonizing code

The test test-inotify-dirty-dirstate shows a different output:


ERROR: test-inotify-dirty-dirstate output changed
--- Expected output 
+++ Test output 
@@ -1,9 +1,14 @@
 % issue1801: inotify and fetch
 adding foo
-updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+/home/nicdumz/tmp/hgtests.LNxOxq/install/lib/python/mercurial/lock.py:80:
DeprecationWarning: use lock.release instead of del lock
+  locker = self.testlock()
 adding bar
+/home/nicdumz/tmp/hgtests.LNxOxq/install/lib/python/mercurial/lock.py:80:
DeprecationWarning: use lock.release instead of del lock
+  locker = self.testlock()
 adding spam
+/home/nicdumz/tmp/hgtests.LNxOxq/install/lib/python/mercurial/lock.py:80:
DeprecationWarn
ing: use lock.release instead of del lock
+  locker = self.testlock()
+abort: repository is unrelated
 % issue1719: inotify and mq
 % inserve
 ? hg.pid
!
Failed test-inotify-dirty-dirstate: output changed


I will investigate this.
msg10419 (view) Author: nicdumz Date: 2009-08-24.18:07:22
closing this to use the superseding issue1811
msg10417 (view) Author: moist Date: 2009-08-24.15:23:42
You're right. Disabling the inotify extension and then running the exact
same commands again yields the expected result:

--snipp--
moist:/tmp/t/test% hg fetch
pulling from /tmp/test
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
updating to 2:57e41f85a07b
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:f36ef5bcfc29
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
new changeset 3:d1ccf999c5ce merges remote changes with local
--snapp--
msg10416 (view) Author: nicdumz Date: 2009-08-24.14:54:34
hello!

Can you try disabling inotify?

It looks like an inotify bug...
msg10415 (view) Author: moist Date: 2009-08-24.14:34:52
My .hgrc:

--snipp--
[ui]
username = me <mail@mydomain.com>
merge = kdiff3

[extensions]
hgext.fetch =
hgext.convert = 
hgext.pager =
hgext.color = 
hgext.highlight = 
hgext.inotify = 
hgext.record =
hgext.purge = 

[pager]
attend = log, diff

[defaults]
commit = -v
pull = -uv
msg10414 (view) Author: moist Date: 2009-08-24.14:33:16
I'm using Mercurial 1.3.1 on Debian GNU/Linux with Python 2.5.4 on amd64.

Here's a demonstration of the bug:
--snipp--
moist:/tmp% mkdir test; cd test
moist:/tmp/test% hg init
moist:/tmp/test% echo foo > foo
moist:/tmp/test% hg add
adding foo
moist:/tmp/test% hg ci -m foo
foo
committed changeset 0:eb0fb1c95db7
moist:/tmp/test% mkdir ../t; cd ../t
moist:/tmp/t% hg clone /tmp/test
destination directory: test
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
moist:/tmp/t% cd test
foo
moist:/tmp/t/test% echo bar > bar
moist:/tmp/t/test% hg add
adding bar
moist:/tmp/t/test% hg ci -m bar
bar
committed changeset 1:6149ed96da59
moist:/tmp/t/test% cd ../../test
foo
moist:/tmp/test% echo spam > spam
moist:/tmp/test% hg add
adding spam
moist:/tmp/test% hg ci -m spam
spam
committed changeset 1:fa52a4563e47
moist:/tmp/test% cd ../t/test
bar  foo
moist:/tmp/t/test% hg st
moist:/tmp/t/test% hg fetch
pulling from /tmp/test
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
updating to 2:fa52a4563e47
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:6149ed96da59
abort: outstanding uncommitted changes (use 'hg status' to list changes)
moist:255:/tmp/t/test% hg st
moist:/tmp/t/test% hg ci -m what
nothing changed
--snapp--
History
Date User Action Args
2011-10-25 22:56:11mpmsetstatus: chatting -> done-cbb
nosy: djc, nicdumz, moist
2009-11-13 06:13:17nicdumzsettopic: + inotify
nosy: djc, nicdumz, moist
2009-11-13 05:45:50nicdumzsetnosy: djc, nicdumz, moist
assignedto: nicdumz
2009-11-13 05:45:43nicdumzsetstatus: resolved -> chatting
nosy: djc, nicdumz, moist
superseder: - inotify uses dirstate data when it's dirty
messages: + msg10959
2009-08-24 18:07:22nicdumzsetstatus: chatting -> resolved
nosy: djc, nicdumz, moist
superseder: + inotify uses dirstate data when it's dirty
messages: + msg10419
2009-08-24 15:23:42moistsetnosy: djc, nicdumz, moist
messages: + msg10417
2009-08-24 14:54:34nicdumzsetnosy: + nicdumz
messages: + msg10416
2009-08-24 14:37:47djcsetnosy: + djc
2009-08-24 14:34:52moistsetstatus: unread -> chatting
messages: + msg10415
2009-08-24 14:33:17moistcreate