Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

     1

SOURCES=$(wildcard *.[0-9].txt)

     2

MAN=$(SOURCES:%.txt=%)

     3

HTML=$(SOURCES:%.txt=%.html)

     4

PREFIX=/usr/local

     5

MANDIR=$(PREFIX)/share/man

     6

INSTALL=install -c

     7

     8

all: man html

     9

    10

man: $(MAN)

    11

    12

html: $(HTML)

    13

    14

hg.1.txt: hg.1.gendoc.txt

    15

	touch hg.1.txt

    16

    17

hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py

    18

	python gendoc.py > $@

    19

    20

%: %.xml

    21

	xmlto man $*.xml

    22

    23

%.xml: %.txt

    24

	asciidoc -d manpage -b docbook $*.txt

    25

    26

%.html: %.txt

    27

	asciidoc -b html4 $*.txt || asciidoc -b html $*.txt

    28

    29

MANIFEST: man html

    30

	# versionned files are already in the main MANIFEST

    31

	$(RM) $@

    32

	for i in $(MAN) $(HTML) hg.1.gendoc.txt; do \

    33

	  echo "doc/$$i" >> $@ ; \

    34

	done

    35

    36

install: man

    37

	for i in $(MAN) ; do \

    38

	  subdir=`echo $$i | sed -n 's/..*\.\([0-9]\)$$/man\1/p'` ; \

    39

	  mkdir -p $(DESTDIR)/$(MANDIR)/$$subdir ; \

    40

	  $(INSTALL) $$i $(DESTDIR)/$(MANDIR)/$$subdir ; \

    41

	done

    42

    43

clean:

    44

	$(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST