upstream/mercurial-mirror Files · mercurial/bdiff.h

dispatch: change cwd when loading local config...

dispatch: change cwd when loading local config Previously, the `_getlocal` function would not correctly load the repo config when given a relative `rpath` and an alternate cwd via the `wd` parameter. Normally when `--cwd` is specified, hg changes to the given directory before attempting to load the local config (and therefore does not specify a `wd`). The only time the function is called with `wd` set is when hg is running as a command server (e.g., with chg), in which case each forked worker process will attempt to configure itself via `_getlocal` before responding to the client. When given a relative repo path, the worker fails to load the repo config, detects a config mismatch with the client, and enters a redirect/respawn loop. To fix this, we can simply change to the desired working directory during config loading. (Note that simply concatenating `wd` and `rpath` won't work in all cases. The repo path could be something more complicated than a simple relative path, such as a `union:` repo.)

David Demelier - - Load All Authors

File last commit:

r49095:d8690805 default


                r50317:3681a476

default

Download file

             bdiff.h
        
                    23 lines
            
             | 463 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bdiff.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        David Demelier
    
hg: remove reserved identifiers...

              r49095
            
      #ifndef HG_BDIFF_H

      #define HG_BDIFF_H

        Maciej Fijalkowski
    
bdiff: split bdiff into cpy-aware and cpy-agnostic part

              r29541
            
        Yuya Nishihara
    
bdiff: include compat.h in header to define ssize_t...

              r34653
            
      #include "compat.h"

        Maciej Fijalkowski
    
bdiff: split bdiff into cpy-aware and cpy-agnostic part

              r29541
            
      struct bdiff_line {

      	int hash, n, e;

      	ssize_t len;

      	const char *l;

      };

      struct bdiff_hunk;

      struct bdiff_hunk {

      	int a1, a2, b1, b2;

      	struct bdiff_hunk *next;

      };

      int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr);

      int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn,

        Augie Fackler
    
bdiff: format header file with clang-format...

              r34628
            
                     struct bdiff_hunk *base);

        Maciej Fijalkowski
    
bdiff: split bdiff into cpy-aware and cpy-agnostic part

              r29541
            
      void bdiff_freehunks(struct bdiff_hunk *l);

      #endif

	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

David Demelier hg: remove reserved identifiers...	r49095	#ifndef HG_BDIFF_H
		#define HG_BDIFF_H
Maciej Fijalkowski bdiff: split bdiff into cpy-aware and cpy-agnostic part	r29541
Yuya Nishihara bdiff: include compat.h in header to define ssize_t...	r34653	#include "compat.h"

Maciej Fijalkowski bdiff: split bdiff into cpy-aware and cpy-agnostic part	r29541	struct bdiff_line {
		int hash, n, e;
		ssize_t len;
		const char *l;
		};

		struct bdiff_hunk;
		struct bdiff_hunk {
		int a1, a2, b1, b2;
		struct bdiff_hunk *next;
		};

		int bdiff_splitlines(const char a, ssize_t len, struct bdiff_line *lr);
		int bdiff_diff(struct bdiff_line a, int an, struct bdiff_line b, int bn,
Augie Fackler bdiff: format header file with clang-format...	r34628	struct bdiff_hunk *base);
Maciej Fijalkowski bdiff: split bdiff into cpy-aware and cpy-agnostic part	r29541	void bdiff_freehunks(struct bdiff_hunk *l);

		#endif