Diff for "CaseFoldExtension"

Fold: Case Folding Rescue

This extension is not distributed with Mercurial.

Author: BradOlson

Repository: http://bitbucket.org/bradobro/hgfold/

Tested with: Mercurial 1.6

Status: Not updating. With Mercurial 1.7.5 (and perhaps earlier), Mercurial does saner things on Windows when case-collisions cause an update abort. It is not possible to recover without this extension by hg mv-ing one of the offending files. My employer is seeing fewer case folding problems and considering manual fixes to them. If this proves insufficient, this extension may be resurrected.

Definitions

FS

Filesystem (file system).

CS

Case-sensitive (case-preserving), a context where "THEGREENTREE" and "thegreentree" refer to two different files.

CI

Case-insensitive (case-folding), a context where "THEGREENTREE" and "thegreentree" refer to the same file or entity.

Collision

Case collision, two names that differ only by case.

Overview

This extension seeks to comprehensively deal with the problem of Mercurial filename case collisions in merges and updates. (It does not address Mercurial's internal storage, which is and needs to be CI no matter the file system, cf. CaseFoldingPlan.)

Basic understandings about filename collisions.

1. It takes a person to decide whether a project's filenames are CI or CS. Current FS is not an adequate decider.
2. In a CS project, a collision is just another file; in a CI project, a collision is a conflict.

3. Mercurial users need sane ways to remedy collisions on a CIFS. (It's easy to fix them on a CSFS, but on a CIFS you have to modify parentage, which can get dangerous. See FixingCaseCollisions.)

It proposes the following phases:

1. (Done) Add options to merge and update that will treat collisions as conflicts that need merging.

2. Adding options to other commands (add, addrem, commit, clone, and rename) to handle/prevent folds.

3. Add .hgfold to define cannonical forms of filenames and flag that a repository needs to behave as if file names case-insensitive

Limitations

This extension has not been tested on filenames containing characters outside the basic Roman set.

Configuration

Configure your .hgrc to enable the extension by adding following lines:

[extensions]
fold = /full/path/to/fold.py

Usage

hg help update and hg help merge have been augmented to describe this extension.

hg update --fold [-C] [-d DATE] [[-r] REV]
    -n --dry-run  do not perform actions, just print output
    --fold     treat filename collisions as the same file, merging as needed

hg merge --fold [-f] [[-r] REV]
    -n --dry-run  do not perform actions, just print output
    --fold     treat filename collisions as the same file, merging as needed

Development Discussion

Mercurial Command Extension

This extension demonstrates a way of extending existing mercurial commands (as opposed to simply adding a new command). There are risks and advantages to this. It tries to do it as safely as possible:

1. The original command entry if found and retained.
2. New options are audited so they will not overlap with existing command options (even future ones).
3. Command help and syntax is augmented.
4. A wrapper function is called instead of the original command function. Best practice is for that wrapper, if it learns that its extra services are not needed, to execute the original command function with the arguments pertinent to it.

Other Types of Filename Collisions

This extension acknowledges that there are other ways for filenames to collid besides case. By changing the definition of collisionFinder.cannonize(), it can be taught to find other types of filename collisions.

I welcome any suggestions.

Other Solutions

Other approaches are outlined at CaseFolding.

CategoryExtensionsByOthers