upstream/mercurial-mirror Files · contrib/chg/Makefile

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Valentin Gatien-Baron - - Load All Authors

File last commit:

r46125:eb443f7c default


                r49398:60a06b0d

default

Download file

             Makefile
        
                    43 lines
            
             | 895 B
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / contrib / chg / Makefile
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      TARGET = chg

      SRCS = chg.c hgclient.c procutil.c util.c

      OBJS = $(SRCS:.c=.o)

      CFLAGS ?= -O2 -Wall -Wextra -pedantic -g

      CPPFLAGS ?= -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE

      override CFLAGS += -std=gnu99

      ifdef HGPATH

      override CPPFLAGS += -DHGPATH=\"$(HGPATH)\"

      endif

      ifdef HGPATHREL

      override CPPFLAGS += -DHGPATHREL=\"$(HGPATHREL)\"

      endif

      DESTDIR =

      PREFIX = /usr/local

      MANDIR = $(PREFIX)/share/man/man1

      .PHONY: all

      all: $(TARGET)

      $(TARGET): $(OBJS)

      	$(CC) $(LDFLAGS) -o $@ $(OBJS)

      chg.o: hgclient.h procutil.h util.h

      hgclient.o: hgclient.h procutil.h util.h

      procutil.o: procutil.h util.h

      util.o: util.h

      .PHONY: install

      install: $(TARGET)

      	install -d "$(DESTDIR)$(PREFIX)"/bin

      	install -m 755 "$(TARGET)" "$(DESTDIR)$(PREFIX)"/bin

      	install -d "$(DESTDIR)$(MANDIR)"

      	install -m 644 chg.1 "$(DESTDIR)$(MANDIR)"

      .PHONY: clean

      clean:

      	$(RM) $(OBJS)

      .PHONY: distclean

      distclean:

      	$(RM) $(OBJS) $(TARGET)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				TARGET = chg
				SRCS = chg.c hgclient.c procutil.c util.c
				OBJS = $(SRCS:.c=.o)

				CFLAGS ?= -O2 -Wall -Wextra -pedantic -g
				CPPFLAGS ?= -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
				override CFLAGS += -std=gnu99
				ifdef HGPATH
				override CPPFLAGS += -DHGPATH=\"$(HGPATH)\"
				endif
				ifdef HGPATHREL
				override CPPFLAGS += -DHGPATHREL=\"$(HGPATHREL)\"
				endif

				DESTDIR =
				PREFIX = /usr/local
				MANDIR = $(PREFIX)/share/man/man1

				.PHONY: all
				all: $(TARGET)

				$(TARGET): $(OBJS)
				$(CC) $(LDFLAGS) -o $@ $(OBJS)

				chg.o: hgclient.h procutil.h util.h
				hgclient.o: hgclient.h procutil.h util.h
				procutil.o: procutil.h util.h
				util.o: util.h

				.PHONY: install
				install: $(TARGET)
				install -d "$(DESTDIR)$(PREFIX)"/bin
				install -m 755 "$(TARGET)" "$(DESTDIR)$(PREFIX)"/bin
				install -d "$(DESTDIR)$(MANDIR)"
				install -m 644 chg.1 "$(DESTDIR)$(MANDIR)"

				.PHONY: clean
				clean:
				$(RM) $(OBJS)

				.PHONY: distclean
				distclean:
				$(RM) $(OBJS) $(TARGET)