##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: add support for partial conflict resolution by external tool...
filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356
Valentin Gatien-Baron - - Load All Authors

File last commit:

r46125:eb443f7c default
r49838:f3aafd78 default
Show More
Makefile
43 lines | 895 B | text/x-makefile | MakefileLexer
/ contrib / chg / Makefile
History | Source | Raw |Copy content |Copy permalink
Yuya Nishihara
chg: import frontend sources...
 r28060 TARGET = chg
Jun Wu
chg: add procutil.h...
 r30693 SRCS = chg.c hgclient.c procutil.c util.c
Yuya Nishihara
chg: import frontend sources...
 r28060 OBJS = $(SRCS:.c=.o)
CFLAGS ?= -O2 -Wall -Wextra -pedantic -g
Mathias De Maré
chg: define _GNU_SOURCE to allow CentOS 5 compilation...
 r33666 CPPFLAGS ?= -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
Yuya Nishihara
chg: import frontend sources...
 r28060 override CFLAGS += -std=gnu99
Jun Wu
chg: allows default hg path to be overridden...
 r28605 ifdef HGPATH
override CPPFLAGS += -DHGPATH=\"$(HGPATH)\"
endif
Valentin Gatien-Baron
chg: make is possible to call by default an hg binary located next to chg...
 r46128 ifdef HGPATHREL
override CPPFLAGS += -DHGPATHREL=\"$(HGPATHREL)\"
endif
Yuya Nishihara
chg: import frontend sources...
 r28060
DESTDIR =
PREFIX = /usr/local
MANDIR = $(PREFIX)/share/man/man1
.PHONY: all
all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS)
Jun Wu
chg: add procutil.h...
 r30693 chg.o: hgclient.h procutil.h util.h
Jun Wu
chg: handle pager request client-side...
 r30738 hgclient.o: hgclient.h procutil.h util.h
Jun Wu
chg: add procutil.h...
 r30693 procutil.o: procutil.h util.h
Yuya Nishihara
chg: import frontend sources...
 r28060 util.o: util.h
.PHONY: install
install: $(TARGET)
muxator
build: chg build was failing when the base directory contained spaces
 r34625 install -d "$(DESTDIR)$(PREFIX)"/bin
install -m 755 "$(TARGET)" "$(DESTDIR)$(PREFIX)"/bin
install -d "$(DESTDIR)$(MANDIR)"
install -m 644 chg.1 "$(DESTDIR)$(MANDIR)"
Yuya Nishihara
chg: import frontend sources...
 r28060
.PHONY: clean
clean:
$(RM) $(OBJS)
.PHONY: distclean
distclean:
$(RM) $(OBJS) $(TARGET)