Commit Graph

269 Commits

Author SHA1 Message Date
Matt Mackall
341df0d469 dirstate: skip optimization on case-folding FS (issue2440) 2010-11-01 14:18:42 -05:00
Matt Mackall
51b3b09c8f backout most of 26e0b9a8ce0d 2010-09-24 12:46:54 -05:00
Brodie Rao
7362459729 cleanup: use x in (a, b) instead of x == a or x == b 2010-09-23 00:02:31 -05:00
Patrick Mezard
614db673f4 Merge with stable 2010-09-20 22:29:13 +02:00
Patrick Mezard
979ccf4590 Use lexists() instead of exists() where appropriate 2010-09-20 21:46:56 +02:00
Martin Geisler
974ce28a22 dirstate: use one pass to filter out files in subrepos 2010-09-10 23:53:51 +02:00
Martin Geisler
839c3422d1 cmdutil: use repo.auditor when constructing match object
This gives the repository control over which nested repository paths
that should be allowed via the custom path auditor.

Since paths into subrepositories are now allowed, dirstate.walk must
now filter away more paths than before.
2010-09-03 12:58:51 +02:00
Martin Geisler
797369393f dirstate: ignore symlinks when fs cannot handle them (issue1888)
When the filesystem cannot handle the executable bit, we currently
ignore it completely when looking for modified files. Similarly, it is
impossible to set or clear the bit when the filesystem ignores it.

This patch makes Mercurial treat symbolic links the same way.

Symlinks are a little different since they manifest themselves as
small files containing a filename (the symlink target). On Windows,
these files show up as regular files, and on Linux and Mac they show
up as real symlinks.

Issue1888 presents a case where the symlink files are better ignored
from the Windows side. A Linux client creates symlinks in a working
copy which is shared over a network between Linux and Windows clients.

The Samba server is helpful and defererences the symlink when the
Windows client looks at it. This means that Mercurial on the Windows
side sees file content instead of a file name in the symlink, and
hence flags the link as modified. Ignoring the change would be much
more helpful, similarly to how Mercurial does not report any changes
when executable bits are ignored in a checkout on Windows.

An initial checkout of a symbolic link on a file system that cannot
handle symbolic links will still result in a regular file containing
the target file name as its content. Sharing such a checkout with a
Linux client will not turn the file into a symlink automatically, but
'hg revert' can fix that. After the revert, the Windows client will
see the correct file content (provided by the Samba server when it
follows the link on the Linux side) and otherwise ignore the change.

Running 'hg perfstatus' 10 times gives these results:

  Before:          After:
  min: 0.544703    min: 0.546549
  med: 0.547592    med: 0.548881
  avg: 0.549146    avg: 0.548549
  max: 0.564112    max: 0.551504

The median time is increased about 0.24%.
2010-08-09 15:31:56 +02:00
Benoit Boissinot
33390381d7 dirstate: more explicit name, rename normaldirty() to otherparent() 2010-04-20 11:17:01 +02:00
Benoit Boissinot
f54fbfa907 dirstate: remove unused variable 2010-04-16 19:18:20 +02:00
Benoit Boissinot
498261f658 dirstate: no need to iterate twice, a dict can be updated in place 2010-04-06 11:49:42 +02:00
Benoit Boissinot
c3e1bfcf81 dirstate: fix in memory dirstate entries for 1-second race
Only the on-disk file was modified, we need to modify the in-memory dirstate
as well.
2010-04-05 18:13:20 +02:00
Matt Mackall
dd8f91e931 Merge with stable 2010-02-11 17:44:01 -06:00
Wagner Bruna
a4d5546600 branch: avoid using reserved tag names
Reported as Debian bug #552423.
2010-02-11 12:02:48 -02:00
Benoit Boissinot
328394047f fix coding style (reported by pylint) 2010-02-08 15:36:34 +01:00
Matt Mackall
595d66f424 Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
Benoit Boissinot
f7540399b7 remove unused imports 2009-10-31 16:56:58 +01:00
Alexander Solovyov
32999e4659 make path expanding more consistent
This expands ~user and $FOO constructs in ui.ignore files, [defaults],
[paths], extension paths, and HGRCPATH files.
2009-10-19 22:19:28 +03:00
Greg Ward
0957bc4d5c dirstate: add/improve method docstrings.
- add doc to __init__(), _map(), status()
- enhance for __getitem__()
- fix inaccurate doc for walk() (described wrong return type)
2009-10-01 15:36:45 -04:00
Adrian Buehlmann
03085a4ef2 dirstate: kill dirstate.granularity config option
The dirstate.granularity configuration parameter was never documented,
it only adds code complexity and it is unneeded.

Adding comments describing forced 'unset' entries.
2009-10-01 17:17:52 +02:00
Adrian Buehlmann
0a39b63526 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
This change narrows the race guard that was introduced by ffd022830d6d
("dirstate: ignore stat data for files that were updated too recently")
to not discard the _map entry's stat data if the mtime is in the future.

Without this change, status locks files having odd mtimes in the future
into the 'unset' state, causing needless file compares later (admittedly
harmless), but also inflicting highly irritating sticky effects on
tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).
2009-08-21 14:17:23 +02:00
Patrick Mezard
6d36e612e9 dirstate: fix typo introduced by ceed02d64e3b 2009-06-13 22:42:16 +02:00
Matt Mackall
edecde7d3c dirstate: eliminate reference cycle from normalize
Bound methods hold a reference to self, so assigning a bound method to
an instance unavoidably creates a cycle. Work around this by choosing
a normalize method at walk time instead. Eliminate default arg while
we're at it.
2009-06-08 18:14:44 -05:00
Matt Mackall
7c6f521b8f dirstate: don't complain about 0-length files 2009-06-04 16:21:09 -05:00
Matt Mackall
11d4ab2e09 dirstate: more accurate use of match.dir callback 2009-06-01 20:25:01 -05:00
Matt Mackall
ac02180873 match: fold plan cases down to two special cases
- merge always and match with patterns
- make always and match with patterns the default
- invert dostep3 to skipstep3
- move dirignore test inside exact case
2009-05-31 17:54:18 -05:00
Matt Mackall
fdab704ebc walk: refactor walk plan
- never is gone
- reorder tests more cleanly
- rename nomatches to exact for clearer semantics
2009-05-31 17:54:18 -05:00
Matt Mackall
9c7c16f5cf walk: use match.bad callback for filetype messages 2009-05-31 17:54:18 -05:00
Matt Mackall
37eaadf540 match: ignore return of match.bad
All users returned false, return can now be dropped
2009-05-31 17:54:18 -05:00
Matt Mackall
7c83618e4d walk: simplify logic for badfn clause
- matchfn redundant
- call badfn always rather than fwarn
- use for/else rather than keep var
2009-05-31 17:54:18 -05:00
Matt Mackall
2e3801b37e walk: we always have a badfn 2009-05-31 17:54:18 -05:00
Matt Mackall
6275c6f6e2 walk: simplify check for missing file 2009-05-31 17:54:18 -05:00
Martin Geisler
09d5799bbb dirstate: fixed typo in comment 2009-05-27 23:39:41 +02:00
Matt Mackall
66cde5c7cb dirstate: notice truncated parents read 2009-05-25 12:48:15 -05:00
Simon Heimberg
4b2cc385e8 dirstate: skip step 3 in walk if nothing new will match
nothing will ever match on match.never
nothing new will match on match.exact (all found in step 1)
nothing new will match on match.match when
  there is no pattern and
  there is no direcory in pats
2009-05-14 19:54:26 +02:00
Simon Heimberg
3a8453f88a dirstate: set more states in step 1 of walk 2009-05-14 10:50:45 +02:00
Simon Heimberg
23a0184faf dirstate: use quicker matchfn() instead of match() everywhere
matchfn does the same as match(), but a direct "link"
2009-05-14 19:47:52 +02:00
Simon Heimberg
09ac1e6c92 separate import lines from mercurial and general python modules 2009-04-28 17:40:46 +02:00
Simon Heimberg
054906a1f5 dirstate: translate forgotten string 2009-05-08 07:54:00 +02:00
Matt Mackall
2beed3c7cc dirstate: use propertycache 2009-04-29 20:47:18 -05:00
Martin Geisler
8e4bc1e9ad put license and copyright info into comment blocks 2009-04-26 01:13:08 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00
Matt Mackall
2f9b02c62d replace util.sort with sorted built-in
This is marginally faster for small and moderately-sized lists
2009-04-26 16:50:44 -05:00
Martin Geisler
44aa7e92d1 util: use built-in set instead of util.unique 2009-04-22 00:56:06 +02:00
Patrick Mezard
c8f0bb9bb7 mq: drop copy records when refreshing regular patches (issue1441)
Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.

Reported by Gary Bernhardt
2009-01-04 21:32:40 +01:00
Matt Mackall
8d99be19f0 many, many trivial check-code fixups 2010-01-25 00:05:27 -06:00
Matt Mackall
cd3ef170f7 Merge with stable 2010-01-19 22:45:09 -06:00
Augie Fackler
678623416a dirstate: don't check state of subrepo directories 2009-12-31 17:19:30 -06:00
Martin Geisler
d994e41c61 dirstate: improve docstring formatting
Triple-quoted strings are easier to spot than single-quoted strings.
2009-12-27 23:24:05 +01:00
Benoit Boissinot
ea7fe6dacc remove unused variables 2008-10-28 19:25:26 +01:00