largefiles: fix inappropriate locking (issue3182) Don't lock/write on operations that should be readonly (status). Always lock when writing the lfdirstate (rollback). Don't write lfdirstate until after committing; state isn't actually changed until the commit is complete.

largefiles: correctly handle dirstate status when rebasing When rebasing, we need to trust that the standins are always correct. The rebase operation updates the standins according to the changeset it is rebasing. We need to make the largefiles in the working copy match. If we don't make them match, then they get accidentally reverted, either during the rebase or during the next commit after the rebase. This worked previously only becuase we were relying on the behavior that largefiles with a changed standin, but unchanged contents, never showed up in the list of modified largefiles. Unfortunately, pre-commit hooks can get an incorrect status this way, and it also results in extra execution of code. The solution is to simply trust the standins when we are about to commit a rebased changeset, and politely ask updatelfiles() to pull the new contents down. In this case, updatelfiles() will also mark any files it has pulled down as dirty in the lfdirstate so that pre-commit hooks will get correct status output.

largefiles: implement addremove (issue3064) Implementing addremove correctly in largefiles is tricky, becuase the original addremove function does not call into any of the add or remove function we've already overridden in the extension. So the trick is to implement addremove without duplicating any code. This patch implements addremove by pulling out the interesting parts of override_add() and override_remove() into generic utility functions, and using those to handle the largefiles in addremove. Then a matcher is installed that will ignore all largefiles, and the original addremove function is called to take care of the regular files in addremove. A small bit of monkey patching is used to make sure that remove_largefiles() notifies the user when a file is removed by addremove and also makes sure the removal of largefiles doesn't interfer with the original addremove's operation of removing the standin.

Use explicit integer division Found by running the test suite with the -3 flag to show places where we have int / int division that can be replaced with int // int.

cvsps: pull function definition out of loop

largefiles: Fix parser warning: redefinition of unused 'node' from line 14

merge with stable

largefiles: fix output of hg summary (issue3060)

largefiles: fix confusion upon removal of added largefile (issue3176) This patch makes "hg remove" work the same way on largefiles as it does on regular Mercurial files. If you try to remove an added largefile, the removal fails and you are instead prompted to use "hg forget" to undo the add.

largefiles: remove invalid comment (issue3065) This comment is invalid. The hg.update() function will abort in the case of any genuine error, so there is nothing to check. If we have gotten to this point in execution, nothing critical has gone wrong, and if any standins have been updated, we must pull new largefiles.

largefiles: clean up and shorten test output by using the same log format everywhere

largefiles: remove a chunk of commented out code

Remove FSF mailing address from GPL headers The GPLv3 FAQ suggests to upgrade by [...] replace all your existing v2 license notices (usually at the top of each file) with the new recommended text available on the GNU licenses howto. It's more future-proof because it no longer includes the FSF's postal mailing address. This removes the postal address, but leaves the version number at 2+.

dispatch: lowercase abort message

merge with stable

commands: add link to addremove in commit help text

largefiles: display remote errors from putlfile (issue3123) (issue3149)

cmdutil: simplify duplicatecopies

hgcia: fix diffstat support

copies: rewrite copy detection for non-merge users The existing copy detection API was designed with merge in mind and was ill-suited for doing status/diff. The new pathcopies implementation gives more accurate, easier to use results for comparing two revisions, and is much simpler to understand. Test notes: - test-mv-cp-st.t results finds more renames in the reverse direction now - test-mq-merge.t was always wrong and duplicated a copy in diff that was already present in one of the parent revisions

copies: split the copies api for "normal" and merge cases (API)

merge with stable

progress: Use the same GPL boilerplate as most hg files

color: Use the same GPL boilerplate as most hg files

tests: patch up silly new year's bug

encoding: use hint markup for "please check your locale settings" This will also make test-encoding.t pass on windows. The test would hit some other code path that already used hint markup.

tests: make simple single quotes work with dummyssh on windows Mercurial assumes that the shell on remote servers over ssh servers uses unix quoting rules. Tests using dummyssh are however also run on windows where cmd doesn't parse single quotes like on unix. This hack replaces the single quotes with double quotes on windows - that is enough to make test-ssh.t pass after d8fa35c28335.

tests: ensure platform independent revision hashes in test-notify.t Makes the test pass again on windows after ca572e94d8e7.