1. mirror
  2. mercurial-crew-stable

Commits

Author Commit Message Date Builds
kiilerix
test-gendoc: mute gendoc stderr Solaris had problems with zh_CN and warned "couldn't set locale correctly" on stderr. We don't care.
Branches
stable
kiilerix
test-mq-symlinks: fix symlink handling on solaris It seems like ln -s gets confused if an existing symlink is dangling: $ rm -f a b; ln -s a b; ln -sf b b ln: cannot create b: File exists We now rely on rm instead of on ln -sf.
Branches
stable
kiilerix
test-archive: fix touch datestamps Backport 3acd5f7ab9d0 and 9581d5efb6a5 to stable.
Branches
stable
Patrick Mézard
convert/darcs: improve unsupported format detection (issue2172)
Branches
stable
Patrick Mézard
bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016) _bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and tags caches initializations also recurse in lookup() and end up trying to access _bookmarks again. Massive confusion ensues. I considered fixing all branches and tags cache loading to avoid recursing in lookup() but it would add complexity to otherwise working code provided lookups are performed on nodes or revnums.
Branches
stable
Alexandre Fayolle
Fix memory leak when using hg commands over http repositories When using hg commands over an http repository in a long running process, a httphandler instance is leaked for each command, because of a loop handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which is not handled by Python's gc. Discussion on #mercurial concluded that removing the __del__ method solved the problem.
Branches
stable
Brodie Rao
grep: only catch re.error when compiling regular expressions
Branches
stable
Anthony Foiani
doc: clarify smtp.password usage
Branches
stable
kiilerix
log: include unmodified-in-merge files in log diff/stat (issue2383) f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched filenames, but actually it only contains the names of files changed in the relevant changeset. That meant that log diff/stat of merges missed the diff for files only changed in the other branch. This is a minimal fix for making sure we only use fns when we are following and thus will have problems with merges anyway ..…
Branches
stable
kiilerix
tests: fix unzip -l variability fix 01-01-1980 slipped through the grep.
Branches
stable
Matt Mackall
tests: fix unzip -l variability
Branches
stable
Patrick Mézard
mq: always require --force when pushing patches (issue2363) --force was not necessary when passing --rev since 55578a8d7e84, but this behaviour is usually harmful when branch names are passed instead of explicit revisions.
Branches
stable
Patrick Mézard
context: fix filectx.undelete() (issue2388)
Branches
stable
Matt Mackall
tests: fix hgweb template change
Branches
stable
Ryan Phillips
hgweb: be consistent with the background highlighting on closed branches (Issue2386) The coal and paper web themes will highlight closed branches as a visual cue to the user. This patch makes the other two themes constistent. For users with difficulty differentiating colors, it would be better to split out closed branches to a new table or optionally hide them.
Branches
stable
Dan Villiom Podlaski Christiansen
mq: fix the deprecation comment for qsave & qrestore. Changeset bcf90e712dc3 deprecated qsave and qrestore. In the deprecating comment, users were referred to 'rebase --mq' which -- at the time the message was written -- didn't exist. Currently, on the default branch, rebase *does* take a '--mq' option, but it probably doesn't do what Dirkjan expected it to do when he wrote the message. In the original, deprecating commit, little context was provide…
Branches
stable
Patrick Mézard
Use lexists() instead of exists() where appropriate
Branches
stable
Patrick Mézard
convert/svn: fix broken symlink renames in svn sink
Branches
stable
Patrick Mézard
rename: do not overwrite existing broken symlinks
Branches
stable
Patrick Mézard
patch: do not overwrite broken untracked symlinks
Branches
stable
Patrick Mézard
patch: fix target when patching broken symlinks (issue2368)
Branches
stable
Brodie Rao
revset: handle re.compile() errors in grep() Raise error.ParseError instead of allowing re.error to bubble up.
Branches
stable
Martin Geisler
archive: set date to 1980 for very old zip files The zip file format stores the date using "MS-DOS format" which apparently means that they use 1980 as their epoch. Python's zipfile module emits deprecation warnings of this form /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct integer overflow masking is deprecated self.fp.write(zinfo.FileHeader()) /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format requ…
Branches
stable
Steve Borho
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
Branches
stable
Matt Mackall
merge with crew
Branches
stable
Matt Mackall
merge with i18n
Branches
stable
Wagner Bruna
i18n-pt_BR: synchronized with 0f6164806283
Branches
stable
Steve Borho
eol: setup the repo.ui in reposetup() This fixes problems some have reported using the eol extension together with TortoiseHg. It ensures the ui associated with the repository has the preupdate.eol hook configured.
Branches
stable
Sune Foldager
color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.
Branches
stable
Brodie Rao
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354) Given a commit author or message with non-ASCII characters in a darcs repo, convert would raise a UnicodeEncodeError when adding changesets to the hg changelog. This happened because etree returns back unicode objects for any text it can't encode into ASCII. convert was passing these objects to changelog.add(), which would then attempt encoding.fromlocal() on them. This patch ensures converter_s…
Branches
stable
  1. Prev
  2. Next