git-sync-js 1.1.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +38 -16
- package/dist/src/clone.d.ts +3 -3
- package/dist/src/clone.d.ts.map +1 -1
- package/dist/src/clone.js +15 -11
- package/dist/src/clone.js.map +1 -1
- package/dist/src/commitAndSync.d.ts +8 -8
- package/dist/src/commitAndSync.d.ts.map +1 -1
- package/dist/src/commitAndSync.js +70 -66
- package/dist/src/commitAndSync.js.map +1 -1
- package/dist/src/credential.d.ts.map +1 -1
- package/dist/src/credential.js +2 -2
- package/dist/src/credential.js.map +1 -1
- package/dist/src/errors.d.ts +3 -3
- package/dist/src/errors.d.ts.map +1 -1
- package/dist/src/errors.js +2 -1
- package/dist/src/errors.js.map +1 -1
- package/dist/src/forcePull.d.ts +22 -0
- package/dist/src/forcePull.d.ts.map +1 -0
- package/dist/src/forcePull.js +58 -0
- package/dist/src/forcePull.js.map +1 -0
- package/dist/src/index.d.ts +5 -4
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +5 -4
- package/dist/src/index.js.map +1 -1
- package/dist/src/init.js.map +1 -1
- package/dist/src/initGit.d.ts +7 -7
- package/dist/src/initGit.d.ts.map +1 -1
- package/dist/src/initGit.js +2 -2
- package/dist/src/initGit.js.map +1 -1
- package/dist/src/inspect.d.ts +2 -2
- package/dist/src/inspect.d.ts.map +1 -1
- package/dist/src/inspect.js +24 -10
- package/dist/src/inspect.js.map +1 -1
- package/dist/src/interface.d.ts +53 -31
- package/dist/src/interface.d.ts.map +1 -1
- package/dist/src/interface.js +54 -25
- package/dist/src/interface.js.map +1 -1
- package/dist/src/sync.d.ts +5 -0
- package/dist/src/sync.d.ts.map +1 -1
- package/dist/src/sync.js +16 -2
- package/dist/src/sync.js.map +1 -1
- package/package.json +35 -39
package/dist/src/index.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/** primary functions */
|
|
2
|
-
export * from './initGit';
|
|
3
|
-
export * from './commitAndSync';
|
|
4
2
|
export * from './clone';
|
|
3
|
+
export * from './commitAndSync';
|
|
4
|
+
export * from './initGit';
|
|
5
5
|
/** utils */
|
|
6
|
-
export * from './
|
|
6
|
+
export * from './credential';
|
|
7
7
|
export * from './defaultGitInfo';
|
|
8
8
|
export * from './errors';
|
|
9
|
-
export * from './
|
|
9
|
+
export * from './forcePull';
|
|
10
10
|
export * from './inspect';
|
|
11
|
+
export * from './interface';
|
|
11
12
|
export * from './sync';
|
|
12
13
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,YAAY;AACZ,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC"}
|
package/dist/src/index.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/** primary functions */
|
|
2
|
-
export * from './initGit';
|
|
3
|
-
export * from './commitAndSync';
|
|
4
2
|
export * from './clone';
|
|
3
|
+
export * from './commitAndSync';
|
|
4
|
+
export * from './initGit';
|
|
5
5
|
/** utils */
|
|
6
|
-
export * from './
|
|
6
|
+
export * from './credential';
|
|
7
7
|
export * from './defaultGitInfo';
|
|
8
8
|
export * from './errors';
|
|
9
|
-
export * from './
|
|
9
|
+
export * from './forcePull';
|
|
10
10
|
export * from './inspect';
|
|
11
|
+
export * from './interface';
|
|
11
12
|
export * from './sync';
|
|
12
13
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,YAAY;AACZ,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC"}
|
package/dist/src/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,kDAAkD;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAwBlD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,OAAyB;IAC5G,IAAI,OAAO,EAAE,IAAI,KAAK,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,kDAAkD;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAwBlD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,OAAyB;IAC5G,IAAI,OAAO,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,oBAAoB,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;IACvF,CAAC;SAAM,CAAC;QACN,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,oBAAoB,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,OAAO,EAAE,aAAa,KAAK,KAAK,EAAE,CAAC;QACrC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,qCAAqC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7G,CAAC;AACH,CAAC"}
|
package/dist/src/initGit.d.ts
CHANGED
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import { IGitUserInfosWithoutToken, IGitUserInfos, ILogger } from './interface';
|
|
2
1
|
import { defaultGitInfo as defaultDefaultGitInfo } from './defaultGitInfo';
|
|
2
|
+
import { IGitUserInfos, IGitUserInfosWithoutToken, ILogger } from './interface';
|
|
3
3
|
export type IInitGitOptions = IInitGitOptionsSyncImmediately | IInitGitOptionsNotSync;
|
|
4
4
|
export interface IInitGitOptionsSyncImmediately {
|
|
5
|
+
defaultGitInfo?: typeof defaultDefaultGitInfo;
|
|
5
6
|
/** wiki folder path, can be relative */
|
|
6
7
|
dir: string;
|
|
7
|
-
|
|
8
|
-
syncImmediately: true;
|
|
8
|
+
logger?: ILogger;
|
|
9
9
|
/** only required if syncImmediately is true, the storage service url we are sync to, for example your github repo url */
|
|
10
10
|
remoteUrl: string;
|
|
11
|
+
/** should we sync after git init? */
|
|
12
|
+
syncImmediately: true;
|
|
11
13
|
/** user info used in the commit message */
|
|
12
14
|
userInfo: IGitUserInfos;
|
|
13
|
-
logger?: ILogger;
|
|
14
|
-
defaultGitInfo?: typeof defaultDefaultGitInfo;
|
|
15
15
|
}
|
|
16
16
|
export interface IInitGitOptionsNotSync {
|
|
17
|
+
defaultGitInfo?: typeof defaultDefaultGitInfo;
|
|
17
18
|
/** wiki folder path, can be relative */
|
|
18
19
|
dir: string;
|
|
20
|
+
logger?: ILogger;
|
|
19
21
|
/** should we sync after git init? */
|
|
20
22
|
syncImmediately?: false;
|
|
21
23
|
userInfo?: IGitUserInfosWithoutToken | IGitUserInfos;
|
|
22
|
-
logger?: ILogger;
|
|
23
|
-
defaultGitInfo?: typeof defaultDefaultGitInfo;
|
|
24
24
|
}
|
|
25
25
|
export declare function initGit(options: IInitGitOptions): Promise<void>;
|
|
26
26
|
//# sourceMappingURL=initGit.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initGit.d.ts","sourceRoot":"","sources":["../../src/initGit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"initGit.d.ts","sourceRoot":"","sources":["../../src/initGit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAW,aAAa,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGzF,MAAM,MAAM,eAAe,GAAG,8BAA8B,GAAG,sBAAsB,CAAC;AACtF,MAAM,WAAW,8BAA8B;IAC7C,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC9C,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yHAAyH;IACzH,SAAS,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,eAAe,EAAE,IAAI,CAAC;IACtB,2CAA2C;IAC3C,QAAQ,EAAE,aAAa,CAAC;CACzB;AACD,MAAM,WAAW,sBAAsB;IACrC,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC9C,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qCAAqC;IACrC,eAAe,CAAC,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,EAAE,yBAAyB,GAAG,aAAa,CAAC;CACtD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCrE"}
|
package/dist/src/initGit.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { truncate } from 'lodash';
|
|
2
|
+
import { commitAndSync } from './commitAndSync';
|
|
3
|
+
import { defaultGitInfo as defaultDefaultGitInfo } from './defaultGitInfo';
|
|
2
4
|
import { SyncParameterMissingError } from './errors';
|
|
3
5
|
import { initGitWithBranch } from './init';
|
|
4
6
|
import { GitStep } from './interface';
|
|
5
|
-
import { defaultGitInfo as defaultDefaultGitInfo } from './defaultGitInfo';
|
|
6
7
|
import { commitFiles } from './sync';
|
|
7
|
-
import { commitAndSync } from './commitAndSync';
|
|
8
8
|
export async function initGit(options) {
|
|
9
9
|
const { dir, userInfo, syncImmediately, logger, defaultGitInfo = defaultDefaultGitInfo } = options;
|
|
10
10
|
const logProgress = (step) => logger?.info(step, {
|
package/dist/src/initGit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initGit.js","sourceRoot":"","sources":["../../src/initGit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"initGit.js","sourceRoot":"","sources":["../../src/initGit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAqD,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAyBrC,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAwB;IACpD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC;IAEnG,MAAM,WAAW,GAAG,CAAC,IAAa,EAAW,EAAE,CAC7C,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE;QACjB,YAAY,EAAE,SAAS;QACvB,IAAI;KACL,CAAC,CAAC;IACL,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,IAAa,EAAW,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAExH,WAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC5C,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,IAAI,cAAc,CAAC;IAClE,QAAQ,CAAC,2BAA2B,GAAG,EAAE,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC3E,MAAM,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,sCAAsC,GAAG,EAAE,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACtF,MAAM,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;IAEnE,oDAAoD;IACpD,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC7B,WAAW,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QACxD,OAAO;IACT,CAAC;IACD,2CAA2C;IAC3C,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,aAAa,IAAI,QAAQ,CAAC,IAAI,QAAQ,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAClG,MAAM,IAAI,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IACD,QAAQ,CACN,uDAAuD,SAAS,qBAAqB,WAAW,oBAC9F,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE;QAC9B,MAAM,EAAE,EAAE;KACX,CACH,EAAE,EACF,OAAO,CAAC,sCAAsC,CAC/C,CAAC;IACF,WAAW,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;IAC5D,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC"}
|
package/dist/src/inspect.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/inspect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/inspect.ts"],"names":[],"mappings":"AASA,OAAO,EAAW,OAAO,EAAE,MAAM,aAAa,CAAC;AAK/C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AACD;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoC7F;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOnF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAUvE;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK/E;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB9F;AAED,MAAM,MAAM,SAAS,GAAG,0BAA0B,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;AAC/F;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAyCnI;AAED,wBAAsB,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAMvI;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAsDrG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBpF;AAED;;;;;GAKG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,UAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAYzE;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAchF"}
|
package/dist/src/inspect.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/* eslint-disable security/detect-non-literal-fs-filename */
|
|
2
2
|
/* eslint-disable unicorn/prevent-abbreviations */
|
|
3
|
+
import { GitProcess } from 'dugite';
|
|
3
4
|
import fs from 'fs-extra';
|
|
4
|
-
import path from 'path';
|
|
5
5
|
import { listRemotes } from 'isomorphic-git';
|
|
6
6
|
import { compact } from 'lodash';
|
|
7
|
-
import
|
|
7
|
+
import path from 'path';
|
|
8
8
|
import url from 'url';
|
|
9
|
-
import { GitStep } from './interface';
|
|
10
9
|
import { AssumeSyncError, CantSyncGitNotInitializedError } from './errors';
|
|
11
|
-
|
|
10
|
+
import { GitStep } from './interface';
|
|
11
|
+
const gitEscapeToEncodedUri = (str) => str.replaceAll(/\\(\d{3})/g, (_, $1) => `%${Number.parseInt($1, 8).toString(16)}`);
|
|
12
12
|
const decodeGitEscape = (rawString) => decodeURIComponent(gitEscapeToEncodedUri(rawString));
|
|
13
13
|
/**
|
|
14
14
|
* Get modified files and modify type in a folder
|
|
@@ -38,12 +38,13 @@ export async function getModifiedFileList(wikiFolderPath) {
|
|
|
38
38
|
* But actually those 346 226 are in radix 8 , if we transform it to radix 16 and add prefix % we can make it uri component.
|
|
39
39
|
* And it should not be parsed in groups of three, because only the CJK between 0x0800 - 0xffff are encoded into three bytes; so we should just replace all the \\\d{3} with hexadecimal, and then give it to the decodeURIComponent to parse.
|
|
40
40
|
*/
|
|
41
|
-
const isSafeUtf8UnescapedString = rawFileRelativePath.startsWith('"') && rawFileRelativePath.endsWith('"') && !rawFileRelativePath.includes(';') &&
|
|
41
|
+
const isSafeUtf8UnescapedString = rawFileRelativePath.startsWith('"') && rawFileRelativePath.endsWith('"') && !rawFileRelativePath.includes(';') &&
|
|
42
|
+
!rawFileRelativePath.includes(',');
|
|
42
43
|
const fileRelativePath = isSafeUtf8UnescapedString ? decodeGitEscape(rawFileRelativePath).replace(/^"/, '').replace(/"$/, '') : rawFileRelativePath;
|
|
43
44
|
return {
|
|
44
45
|
type,
|
|
45
46
|
fileRelativePath,
|
|
46
|
-
filePath: path.join(wikiFolderPath, fileRelativePath),
|
|
47
|
+
filePath: path.normalize(path.join(wikiFolderPath, fileRelativePath)),
|
|
47
48
|
};
|
|
48
49
|
})
|
|
49
50
|
.sort((item, item2) => item.fileRelativePath.localeCompare(item2.fileRelativePath, 'zh'));
|
|
@@ -85,7 +86,7 @@ export async function haveLocalChanges(wikiFolderPath) {
|
|
|
85
86
|
const { stdout } = await GitProcess.exec(['status', '--porcelain'], wikiFolderPath);
|
|
86
87
|
const matchResult = stdout.match(/^(\?\?|[ACMR] |[ ACMR][DM])*/gm);
|
|
87
88
|
// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
|
|
88
|
-
return !!matchResult?.some?.(
|
|
89
|
+
return !!matchResult?.some?.(Boolean);
|
|
89
90
|
}
|
|
90
91
|
/**
|
|
91
92
|
* Get "master" or "main" from git repo
|
|
@@ -99,7 +100,7 @@ export async function getDefaultBranchName(wikiFolderPath) {
|
|
|
99
100
|
const [branchName] = stdout.split('\n');
|
|
100
101
|
// don't return empty string, so we can use ?? syntax
|
|
101
102
|
if (branchName === '') {
|
|
102
|
-
return;
|
|
103
|
+
return undefined;
|
|
103
104
|
}
|
|
104
105
|
return branchName;
|
|
105
106
|
}
|
|
@@ -125,23 +126,36 @@ export async function getSyncState(dir, defaultBranchName, remoteName, logger) {
|
|
|
125
126
|
});
|
|
126
127
|
logProgress(GitStep.CheckingLocalSyncState);
|
|
127
128
|
remoteName = remoteName ?? (await getRemoteName(dir, defaultBranchName));
|
|
128
|
-
const
|
|
129
|
-
|
|
129
|
+
const gitArgs = ['rev-list', '--count', '--left-right', `${remoteName}/${defaultBranchName}...HEAD`];
|
|
130
|
+
const { stdout, stderr } = await GitProcess.exec(gitArgs, dir);
|
|
131
|
+
logDebug(`Checking sync state with upstream, command: \`git ${gitArgs.join(' ')}\` , stdout:\n${stdout}\n(stdout end)`, GitStep.CheckingLocalSyncState);
|
|
130
132
|
if (stderr.length > 0) {
|
|
131
133
|
logDebug(`Have problem checking sync state with upstream,stderr:\n${stderr}\n(stderr end)`, GitStep.CheckingLocalSyncState);
|
|
132
134
|
}
|
|
133
135
|
if (stdout === '') {
|
|
134
136
|
return 'noUpstreamOrBareUpstream';
|
|
135
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* checks for the output 0 0, which means there are no differences between the local and remote branches. If this is the case, the function returns 'equal'.
|
|
140
|
+
*/
|
|
136
141
|
if (/0\t0/.exec(stdout) !== null) {
|
|
137
142
|
return 'equal';
|
|
138
143
|
}
|
|
144
|
+
/**
|
|
145
|
+
* The pattern /0\t\d+/ checks if there are commits on the current HEAD that are not on the remote branch (e.g., 0 2). If this pattern matches, the function returns 'ahead'.
|
|
146
|
+
*/
|
|
139
147
|
if (/0\t\d+/.exec(stdout) !== null) {
|
|
140
148
|
return 'ahead';
|
|
141
149
|
}
|
|
150
|
+
/**
|
|
151
|
+
* The pattern /\d+\t0/ checks if there are commits on the remote branch that are not on the current HEAD (e.g., 2 0). If this pattern matches, the function returns 'behind'.
|
|
152
|
+
*/
|
|
142
153
|
if (/\d+\t0/.exec(stdout) !== null) {
|
|
143
154
|
return 'behind';
|
|
144
155
|
}
|
|
156
|
+
/**
|
|
157
|
+
* If none of these patterns match, the function returns 'diverged'. For example, the output `1 1` will indicates that there is one commit on the origin/main branch that is not on your current HEAD, and also one commit on your current HEAD that is not on the origin/main branch.
|
|
158
|
+
*/
|
|
145
159
|
return 'diverged';
|
|
146
160
|
}
|
|
147
161
|
export async function assumeSync(wikiFolderPath, defaultBranchName, remoteName, logger) {
|
package/dist/src/inspect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/inspect.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,kDAAkD;AAClD,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/inspect.ts"],"names":[],"mappings":"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"}
|
package/dist/src/interface.d.ts
CHANGED
|
@@ -3,69 +3,91 @@ export interface IGitUserInfos extends IGitUserInfosWithoutToken {
|
|
|
3
3
|
accessToken: string;
|
|
4
4
|
}
|
|
5
5
|
export interface IGitUserInfosWithoutToken {
|
|
6
|
+
branch: string;
|
|
6
7
|
/** Git commit message email */
|
|
7
8
|
email: string | null | undefined;
|
|
8
9
|
/** Github Login: username , this is also used to filter user's repo when searching repo */
|
|
9
10
|
gitUserName: string;
|
|
10
|
-
branch: string;
|
|
11
11
|
}
|
|
12
12
|
/** custom logger to report progress on each step
|
|
13
13
|
* we don't use logger to report error, we throw errors.
|
|
14
14
|
*/
|
|
15
15
|
export interface ILogger {
|
|
16
|
-
/** used to report progress for human user to read */
|
|
17
|
-
info: (message: GitStep, context: ILoggerContext) => unknown;
|
|
18
16
|
/** used to report debug logs */
|
|
19
17
|
debug: (message: string, context: ILoggerContext) => unknown;
|
|
18
|
+
/** used to report progress for human user to read */
|
|
19
|
+
info: (message: GitStep, context: ILoggerContext) => unknown;
|
|
20
20
|
/** used to report failed optional progress */
|
|
21
21
|
warn: (message: string, context: ILoggerContext) => unknown;
|
|
22
22
|
}
|
|
23
23
|
/** context to tell logger which function we are in */
|
|
24
24
|
export interface ILoggerContext {
|
|
25
|
-
|
|
26
|
-
step: GitStep;
|
|
25
|
+
branch?: string;
|
|
27
26
|
dir?: string;
|
|
27
|
+
functionName: string;
|
|
28
28
|
remoteUrl?: string;
|
|
29
|
-
|
|
29
|
+
step: GitStep;
|
|
30
30
|
}
|
|
31
31
|
export declare enum GitStep {
|
|
32
|
-
StartGitInitialization = "StartGitInitialization",
|
|
33
|
-
PrepareCloneOnlineWiki = "PrepareCloneOnlineWiki",
|
|
34
|
-
GitRepositoryConfigurationFinished = "GitRepositoryConfigurationFinished",
|
|
35
|
-
StartConfiguringGithubRemoteRepository = "StartConfiguringGithubRemoteRepository",
|
|
36
|
-
StartBackupToGitRemote = "StartBackupToGitRemote",
|
|
37
|
-
PrepareSync = "PrepareSync",
|
|
38
|
-
HaveThingsToCommit = "HaveThingsToCommit",
|
|
39
|
-
AddingFiles = "AddingFiles",
|
|
40
32
|
AddComplete = "AddComplete",
|
|
33
|
+
AddingFiles = "AddingFiles",
|
|
34
|
+
CantSyncInSpecialGitStateAutoFixSucceed = "CantSyncInSpecialGitStateAutoFixSucceed",
|
|
35
|
+
CheckingLocalGitRepoSanity = "CheckingLocalGitRepoSanity",
|
|
36
|
+
CheckingLocalSyncState = "CheckingLocalSyncState",
|
|
41
37
|
CommitComplete = "CommitComplete",
|
|
42
|
-
PreparingUserInfo = "PreparingUserInfo",
|
|
43
38
|
FetchingData = "FetchingData",
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
FinishForcePull = "FinishForcePull",
|
|
40
|
+
GitMerge = "GitMerge",
|
|
41
|
+
GitMergeComplete = "GitMergeComplete",
|
|
42
|
+
GitMergeFailed = "GitMergeFailed",
|
|
43
|
+
GitPush = "GitPush",
|
|
44
|
+
GitPushComplete = "GitPushComplete",
|
|
45
|
+
GitPushFailed = "GitPushFailed",
|
|
46
|
+
GitRepositoryConfigurationFinished = "GitRepositoryConfigurationFinished",
|
|
47
|
+
HaveThingsToCommit = "HaveThingsToCommit",
|
|
46
48
|
LocalAheadStartUpload = "LocalAheadStartUpload",
|
|
47
|
-
CheckingLocalSyncState = "CheckingLocalSyncState",
|
|
48
|
-
CheckingLocalGitRepoSanity = "CheckingLocalGitRepoSanity",
|
|
49
49
|
LocalStateBehindSync = "LocalStateBehindSync",
|
|
50
50
|
LocalStateDivergeRebase = "LocalStateDivergeRebase",
|
|
51
|
-
|
|
51
|
+
NoNeedToSync = "NoNeedToSync",
|
|
52
|
+
NoUpstreamCantPush = "NoUpstreamCantPush",
|
|
53
|
+
PerformLastCheckBeforeSynchronizationFinish = "PerformLastCheckBeforeSynchronizationFinish",
|
|
54
|
+
PrepareCloneOnlineWiki = "PrepareCloneOnlineWiki",
|
|
55
|
+
PrepareSync = "PrepareSync",
|
|
56
|
+
PreparingUserInfo = "PreparingUserInfo",
|
|
52
57
|
RebaseConflictNeedsResolve = "RebaseConflictNeedsResolve",
|
|
58
|
+
RebaseResultChecking = "RebaseResultChecking",
|
|
53
59
|
RebaseSucceed = "RebaseSucceed",
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
+
StartBackupToGitRemote = "StartBackupToGitRemote",
|
|
61
|
+
StartConfiguringGithubRemoteRepository = "StartConfiguringGithubRemoteRepository",
|
|
62
|
+
StartFetchingFromGithubRemote = "StartFetchingFromGithubRemote",
|
|
63
|
+
StartForcePull = "StartForcePull",
|
|
64
|
+
StartGitInitialization = "StartGitInitialization",
|
|
65
|
+
StartResettingLocalToRemote = "StartResettingLocalToRemote",
|
|
60
66
|
/** this means our algorithm have some problems */
|
|
61
67
|
SyncFailedAlgorithmWrong = "SyncFailedAlgorithmWrong",
|
|
62
|
-
|
|
63
|
-
SynchronizationFinish = "SynchronizationFinish",
|
|
64
|
-
StartFetchingFromGithubRemote = "StartFetchingFromGithubRemote",
|
|
65
|
-
CantSyncInSpecialGitStateAutoFixSucceed = "CantSyncInSpecialGitStateAutoFixSucceed"
|
|
68
|
+
SynchronizationFinish = "SynchronizationFinish"
|
|
66
69
|
}
|
|
67
70
|
/**
|
|
68
|
-
* Steps that indicate we have new files, so we can restart our wiki to reload changes
|
|
71
|
+
* Steps that indicate we have new files, so we can restart our wiki to reload changes.
|
|
72
|
+
*
|
|
73
|
+
* @example <pre><code>
|
|
74
|
+
* // (inside a promise)
|
|
75
|
+
* let hasChanges = false;
|
|
76
|
+
observable?.subscribe({
|
|
77
|
+
next: (messageObject) => {
|
|
78
|
+
if (messageObject.level === 'error') {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const { meta } = messageObject;
|
|
82
|
+
if (typeof meta === 'object' && meta !== null && 'step' in meta && stepsAboutChange.includes((meta as { step: GitStep }).step)) {
|
|
83
|
+
hasChanges = true;
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
complete: () => {
|
|
87
|
+
resolve(hasChanges);
|
|
88
|
+
},
|
|
89
|
+
});
|
|
90
|
+
</code></pre>
|
|
69
91
|
*/
|
|
70
92
|
export declare const stepsAboutChange: GitStep[];
|
|
71
93
|
//# sourceMappingURL=interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAc,SAAQ,yBAAyB;IAC9D,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,+BAA+B;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,2FAA2F;IAC3F,WAAW,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAc,SAAQ,yBAAyB;IAC9D,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,2FAA2F;IAC3F,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,gCAAgC;IAChC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;IAC7D,qDAAqD;IACrD,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;IAC7D,8CAA8C;IAC9C,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;CAC7D;AACD,sDAAsD;AACtD,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,oBAAY,OAAO;IACjB,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,uCAAuC,4CAA4C;IACnF,0BAA0B,+BAA+B;IACzD,sBAAsB,2BAA2B;IACjD,cAAc,mBAAmB;IACjC,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,QAAQ,aAAa;IACrB,gBAAgB,qBAAqB;IACrC,cAAc,mBAAmB;IACjC,OAAO,YAAY;IACnB,eAAe,oBAAoB;IACnC,aAAa,kBAAkB;IAC/B,kCAAkC,uCAAuC;IACzE,kBAAkB,uBAAuB;IACzC,qBAAqB,0BAA0B;IAC/C,oBAAoB,yBAAyB;IAC7C,uBAAuB,4BAA4B;IACnD,YAAY,iBAAiB;IAC7B,kBAAkB,uBAAuB;IACzC,2CAA2C,gDAAgD;IAC3F,sBAAsB,2BAA2B;IACjD,WAAW,gBAAgB;IAC3B,iBAAiB,sBAAsB;IACvC,0BAA0B,+BAA+B;IACzD,oBAAoB,yBAAyB;IAC7C,aAAa,kBAAkB;IAC/B,sBAAsB,2BAA2B;IACjD,sCAAsC,2CAA2C;IACjF,6BAA6B,kCAAkC;IAC/D,cAAc,mBAAmB;IACjC,sBAAsB,2BAA2B;IACjD,2BAA2B,gCAAgC;IAC3D,kDAAkD;IAClD,wBAAwB,6BAA6B;IACrD,qBAAqB,0BAA0B;CAChD;AACD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,gBAAgB,WAO5B,CAAC"}
|
package/dist/src/interface.js
CHANGED
|
@@ -1,42 +1,71 @@
|
|
|
1
1
|
export var GitStep;
|
|
2
2
|
(function (GitStep) {
|
|
3
|
-
GitStep["StartGitInitialization"] = "StartGitInitialization";
|
|
4
|
-
GitStep["PrepareCloneOnlineWiki"] = "PrepareCloneOnlineWiki";
|
|
5
|
-
GitStep["GitRepositoryConfigurationFinished"] = "GitRepositoryConfigurationFinished";
|
|
6
|
-
GitStep["StartConfiguringGithubRemoteRepository"] = "StartConfiguringGithubRemoteRepository";
|
|
7
|
-
GitStep["StartBackupToGitRemote"] = "StartBackupToGitRemote";
|
|
8
|
-
GitStep["PrepareSync"] = "PrepareSync";
|
|
9
|
-
GitStep["HaveThingsToCommit"] = "HaveThingsToCommit";
|
|
10
|
-
GitStep["AddingFiles"] = "AddingFiles";
|
|
11
3
|
GitStep["AddComplete"] = "AddComplete";
|
|
4
|
+
GitStep["AddingFiles"] = "AddingFiles";
|
|
5
|
+
GitStep["CantSyncInSpecialGitStateAutoFixSucceed"] = "CantSyncInSpecialGitStateAutoFixSucceed";
|
|
6
|
+
GitStep["CheckingLocalGitRepoSanity"] = "CheckingLocalGitRepoSanity";
|
|
7
|
+
GitStep["CheckingLocalSyncState"] = "CheckingLocalSyncState";
|
|
12
8
|
GitStep["CommitComplete"] = "CommitComplete";
|
|
13
|
-
GitStep["PreparingUserInfo"] = "PreparingUserInfo";
|
|
14
9
|
GitStep["FetchingData"] = "FetchingData";
|
|
15
|
-
GitStep["
|
|
16
|
-
GitStep["
|
|
10
|
+
GitStep["FinishForcePull"] = "FinishForcePull";
|
|
11
|
+
GitStep["GitMerge"] = "GitMerge";
|
|
12
|
+
GitStep["GitMergeComplete"] = "GitMergeComplete";
|
|
13
|
+
GitStep["GitMergeFailed"] = "GitMergeFailed";
|
|
14
|
+
GitStep["GitPush"] = "GitPush";
|
|
15
|
+
GitStep["GitPushComplete"] = "GitPushComplete";
|
|
16
|
+
GitStep["GitPushFailed"] = "GitPushFailed";
|
|
17
|
+
GitStep["GitRepositoryConfigurationFinished"] = "GitRepositoryConfigurationFinished";
|
|
18
|
+
GitStep["HaveThingsToCommit"] = "HaveThingsToCommit";
|
|
17
19
|
GitStep["LocalAheadStartUpload"] = "LocalAheadStartUpload";
|
|
18
|
-
GitStep["CheckingLocalSyncState"] = "CheckingLocalSyncState";
|
|
19
|
-
GitStep["CheckingLocalGitRepoSanity"] = "CheckingLocalGitRepoSanity";
|
|
20
20
|
GitStep["LocalStateBehindSync"] = "LocalStateBehindSync";
|
|
21
21
|
GitStep["LocalStateDivergeRebase"] = "LocalStateDivergeRebase";
|
|
22
|
-
GitStep["
|
|
22
|
+
GitStep["NoNeedToSync"] = "NoNeedToSync";
|
|
23
|
+
GitStep["NoUpstreamCantPush"] = "NoUpstreamCantPush";
|
|
24
|
+
GitStep["PerformLastCheckBeforeSynchronizationFinish"] = "PerformLastCheckBeforeSynchronizationFinish";
|
|
25
|
+
GitStep["PrepareCloneOnlineWiki"] = "PrepareCloneOnlineWiki";
|
|
26
|
+
GitStep["PrepareSync"] = "PrepareSync";
|
|
27
|
+
GitStep["PreparingUserInfo"] = "PreparingUserInfo";
|
|
23
28
|
GitStep["RebaseConflictNeedsResolve"] = "RebaseConflictNeedsResolve";
|
|
29
|
+
GitStep["RebaseResultChecking"] = "RebaseResultChecking";
|
|
24
30
|
GitStep["RebaseSucceed"] = "RebaseSucceed";
|
|
25
|
-
GitStep["
|
|
26
|
-
GitStep["
|
|
27
|
-
GitStep["
|
|
28
|
-
GitStep["
|
|
29
|
-
GitStep["
|
|
30
|
-
GitStep["
|
|
31
|
+
GitStep["StartBackupToGitRemote"] = "StartBackupToGitRemote";
|
|
32
|
+
GitStep["StartConfiguringGithubRemoteRepository"] = "StartConfiguringGithubRemoteRepository";
|
|
33
|
+
GitStep["StartFetchingFromGithubRemote"] = "StartFetchingFromGithubRemote";
|
|
34
|
+
GitStep["StartForcePull"] = "StartForcePull";
|
|
35
|
+
GitStep["StartGitInitialization"] = "StartGitInitialization";
|
|
36
|
+
GitStep["StartResettingLocalToRemote"] = "StartResettingLocalToRemote";
|
|
31
37
|
/** this means our algorithm have some problems */
|
|
32
38
|
GitStep["SyncFailedAlgorithmWrong"] = "SyncFailedAlgorithmWrong";
|
|
33
|
-
GitStep["PerformLastCheckBeforeSynchronizationFinish"] = "PerformLastCheckBeforeSynchronizationFinish";
|
|
34
39
|
GitStep["SynchronizationFinish"] = "SynchronizationFinish";
|
|
35
|
-
GitStep["StartFetchingFromGithubRemote"] = "StartFetchingFromGithubRemote";
|
|
36
|
-
GitStep["CantSyncInSpecialGitStateAutoFixSucceed"] = "CantSyncInSpecialGitStateAutoFixSucceed";
|
|
37
40
|
})(GitStep || (GitStep = {}));
|
|
38
41
|
/**
|
|
39
|
-
* Steps that indicate we have new files, so we can restart our wiki to reload changes
|
|
42
|
+
* Steps that indicate we have new files, so we can restart our wiki to reload changes.
|
|
43
|
+
*
|
|
44
|
+
* @example <pre><code>
|
|
45
|
+
* // (inside a promise)
|
|
46
|
+
* let hasChanges = false;
|
|
47
|
+
observable?.subscribe({
|
|
48
|
+
next: (messageObject) => {
|
|
49
|
+
if (messageObject.level === 'error') {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const { meta } = messageObject;
|
|
53
|
+
if (typeof meta === 'object' && meta !== null && 'step' in meta && stepsAboutChange.includes((meta as { step: GitStep }).step)) {
|
|
54
|
+
hasChanges = true;
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
complete: () => {
|
|
58
|
+
resolve(hasChanges);
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
</code></pre>
|
|
40
62
|
*/
|
|
41
|
-
export const stepsAboutChange = [
|
|
63
|
+
export const stepsAboutChange = [
|
|
64
|
+
GitStep.GitMerge,
|
|
65
|
+
GitStep.FetchingData,
|
|
66
|
+
GitStep.LocalStateBehindSync,
|
|
67
|
+
GitStep.RebaseSucceed,
|
|
68
|
+
GitStep.LocalStateDivergeRebase,
|
|
69
|
+
GitStep.FinishForcePull,
|
|
70
|
+
];
|
|
42
71
|
//# sourceMappingURL=interface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAN,IAAY,OAsCX;AAtCD,WAAY,OAAO;IACjB,sCAA2B,CAAA;IAC3B,sCAA2B,CAAA;IAC3B,8FAAmF,CAAA;IACnF,oEAAyD,CAAA;IACzD,4DAAiD,CAAA;IACjD,4CAAiC,CAAA;IACjC,wCAA6B,CAAA;IAC7B,8CAAmC,CAAA;IACnC,gCAAqB,CAAA;IACrB,gDAAqC,CAAA;IACrC,4CAAiC,CAAA;IACjC,8BAAmB,CAAA;IACnB,8CAAmC,CAAA;IACnC,0CAA+B,CAAA;IAC/B,oFAAyE,CAAA;IACzE,oDAAyC,CAAA;IACzC,0DAA+C,CAAA;IAC/C,wDAA6C,CAAA;IAC7C,8DAAmD,CAAA;IACnD,wCAA6B,CAAA;IAC7B,oDAAyC,CAAA;IACzC,sGAA2F,CAAA;IAC3F,4DAAiD,CAAA;IACjD,sCAA2B,CAAA;IAC3B,kDAAuC,CAAA;IACvC,oEAAyD,CAAA;IACzD,wDAA6C,CAAA;IAC7C,0CAA+B,CAAA;IAC/B,4DAAiD,CAAA;IACjD,4FAAiF,CAAA;IACjF,0EAA+D,CAAA;IAC/D,4CAAiC,CAAA;IACjC,4DAAiD,CAAA;IACjD,sEAA2D,CAAA;IAC3D,kDAAkD;IAClD,gEAAqD,CAAA;IACrD,0DAA+C,CAAA;AACjD,CAAC,EAtCW,OAAO,KAAP,OAAO,QAsClB;AACD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,eAAe;CACxB,CAAC"}
|
package/dist/src/sync.d.ts
CHANGED
|
@@ -33,4 +33,9 @@ export declare function mergeUpstream(dir: string, branch: string, remoteName: s
|
|
|
33
33
|
* @param providedRepositoryState result of `await getGitRepositoryState(dir, logger)`, optional, if not provided, we will run `await getGitRepositoryState(dir, logger)` by ourself.
|
|
34
34
|
*/
|
|
35
35
|
export declare function continueRebase(dir: string, username: string, email: string, logger?: ILogger, providedRepositoryState?: string): Promise<void>;
|
|
36
|
+
/**
|
|
37
|
+
* Simply calling git fetch.
|
|
38
|
+
* @param branch if not provided, will fetch all branches
|
|
39
|
+
*/
|
|
40
|
+
export declare function fetchRemote(dir: string, remoteName: string, branch?: string): Promise<void>;
|
|
36
41
|
//# sourceMappingURL=sync.d.ts.map
|
package/dist/src/sync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAMhD,OAAO,EAAW,aAAa,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEzF;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,SAA4B,EACnC,aAAa,GAAE,MAAM,EAAO,EAC5B,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAMhD,OAAO,EAAW,aAAa,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEzF;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,SAA4B,EACnC,aAAa,GAAE,MAAM,EAAO,EAC5B,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,CAuBrB;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,aAAa,GAAG,yBAAyB,GAAG,SAAS,EAChE,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,CAgBrB;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,aAAa,GAAG,yBAAyB,GAAG,SAAS,EAChE,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,CAerB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,uBAAuB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCpJ;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,iBAMjF"}
|
package/dist/src/sync.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable unicorn/prevent-abbreviations */
|
|
2
2
|
import { GitProcess } from 'dugite';
|
|
3
|
-
import { listFiles, remove } from 'isomorphic-git';
|
|
4
3
|
import fs from 'fs-extra';
|
|
4
|
+
import { listFiles, remove } from 'isomorphic-git';
|
|
5
5
|
import { CantSyncInSpecialGitStateAutoFixFailed, GitPullPushError, SyncScriptIsInDeadLoopError } from './errors';
|
|
6
6
|
import { getGitRepositoryState } from './inspect';
|
|
7
7
|
import { GitStep } from './interface';
|
|
@@ -25,7 +25,9 @@ export async function commitFiles(dir, username, email, message = 'Commit with G
|
|
|
25
25
|
if (filesToIgnore.length > 0) {
|
|
26
26
|
const stagedFilesToIgnore = filesToIgnore.filter((file) => stagedFiles.includes(file));
|
|
27
27
|
if (stagedFilesToIgnore.length > 0) {
|
|
28
|
-
await Promise.all(stagedFilesToIgnore.map(async (file) =>
|
|
28
|
+
await Promise.all(stagedFilesToIgnore.map(async (file) => {
|
|
29
|
+
await remove({ dir, filepath: file, fs });
|
|
30
|
+
}));
|
|
29
31
|
}
|
|
30
32
|
}
|
|
31
33
|
logProgress(GitStep.AddComplete);
|
|
@@ -115,4 +117,16 @@ export async function continueRebase(dir, username, email, logger, providedRepos
|
|
|
115
117
|
}
|
|
116
118
|
logProgress(GitStep.CantSyncInSpecialGitStateAutoFixSucceed);
|
|
117
119
|
}
|
|
120
|
+
/**
|
|
121
|
+
* Simply calling git fetch.
|
|
122
|
+
* @param branch if not provided, will fetch all branches
|
|
123
|
+
*/
|
|
124
|
+
export async function fetchRemote(dir, remoteName, branch) {
|
|
125
|
+
if (branch === undefined) {
|
|
126
|
+
await GitProcess.exec(['fetch', remoteName], dir);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
await GitProcess.exec(['fetch', remoteName, branch], dir);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
118
132
|
//# sourceMappingURL=sync.js.map
|
package/dist/src/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,OAAO,EAAE,UAAU,EAAc,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"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"}
|