git-sync-js 2.0.4 → 2.1.0
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 +9 -15
- package/dist/src/clone.d.ts.map +1 -1
- package/dist/src/clone.js +3 -2
- package/dist/src/clone.js.map +1 -1
- package/dist/src/commitAndSync.d.ts.map +1 -1
- package/dist/src/commitAndSync.js +5 -2
- package/dist/src/commitAndSync.js.map +1 -1
- package/dist/src/credential.d.ts.map +1 -1
- package/dist/src/credential.js +4 -4
- package/dist/src/credential.js.map +1 -1
- package/dist/src/forcePull.d.ts.map +1 -1
- package/dist/src/forcePull.js +3 -2
- package/dist/src/forcePull.js.map +1 -1
- package/dist/src/init.d.ts +2 -2
- package/dist/src/init.d.ts.map +1 -1
- package/dist/src/init.js +4 -5
- package/dist/src/init.js.map +1 -1
- package/dist/src/inspect.d.ts +1 -1
- package/dist/src/inspect.d.ts.map +1 -1
- package/dist/src/inspect.js +42 -33
- package/dist/src/inspect.js.map +1 -1
- package/dist/src/interface.d.ts.map +1 -1
- package/dist/src/interface.js +1 -4
- package/dist/src/interface.js.map +1 -1
- package/dist/src/sync.d.ts +4 -4
- package/dist/src/sync.d.ts.map +1 -1
- package/dist/src/sync.js +9 -9
- package/dist/src/sync.js.map +1 -1
- package/dist/src/utils.d.ts +3 -0
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +6 -0
- package/dist/src/utils.js.map +1 -1
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -16,17 +16,17 @@ There are three major functions: `initGit, clone, commitAndSync`, but you may im
|
|
|
16
16
|
|
|
17
17
|
```ts
|
|
18
18
|
import {
|
|
19
|
-
initGit,
|
|
20
|
-
clone,
|
|
21
|
-
commitAndSync,
|
|
22
19
|
AssumeSyncError,
|
|
23
20
|
CantSyncGitNotInitializedError,
|
|
24
21
|
CantSyncInSpecialGitStateAutoFixFailed,
|
|
22
|
+
clone,
|
|
23
|
+
commitAndSync,
|
|
25
24
|
getModifiedFileList,
|
|
26
25
|
getRemoteUrl,
|
|
27
26
|
GitPullPushError,
|
|
28
27
|
GitStep,
|
|
29
28
|
ILoggerContext,
|
|
29
|
+
initGit,
|
|
30
30
|
ModifiedFileList,
|
|
31
31
|
SyncParameterMissingError,
|
|
32
32
|
SyncScriptIsInDeadLoopError,
|
|
@@ -49,10 +49,8 @@ try {
|
|
|
49
49
|
syncImmediately: isSyncedWiki,
|
|
50
50
|
userInfo: { ...defaultGitInfo, ...userInfo },
|
|
51
51
|
logger: {
|
|
52
|
-
log: (message: string, context: ILoggerContext): unknown =>
|
|
53
|
-
|
|
54
|
-
warn: (message: string, context: ILoggerContext): unknown =>
|
|
55
|
-
logger.warn(message, { callerFunction: 'initWikiGit', ...context }),
|
|
52
|
+
log: (message: string, context: ILoggerContext): unknown => logger.info(message, { callerFunction: 'initWikiGit', ...context }),
|
|
53
|
+
warn: (message: string, context: ILoggerContext): unknown => logger.warn(message, { callerFunction: 'initWikiGit', ...context }),
|
|
56
54
|
info: (message: GitStep, context: ILoggerContext): void => {
|
|
57
55
|
logger.notice(this.translateMessage(message), {
|
|
58
56
|
handler: WikiChannel.syncProgress,
|
|
@@ -78,10 +76,8 @@ try {
|
|
|
78
76
|
remoteUrl,
|
|
79
77
|
userInfo: { ...defaultGitInfo, ...userInfo },
|
|
80
78
|
logger: {
|
|
81
|
-
log: (message: string, context: ILoggerContext): unknown =>
|
|
82
|
-
|
|
83
|
-
warn: (message: string, context: ILoggerContext): unknown =>
|
|
84
|
-
logger.warn(message, { callerFunction: 'commitAndSync', ...context }),
|
|
79
|
+
log: (message: string, context: ILoggerContext): unknown => logger.info(message, { callerFunction: 'commitAndSync', ...context }),
|
|
80
|
+
warn: (message: string, context: ILoggerContext): unknown => logger.warn(message, { callerFunction: 'commitAndSync', ...context }),
|
|
85
81
|
info: (message: GitStep, context: ILoggerContext): void => {
|
|
86
82
|
logger.notice(this.translateMessage(message), {
|
|
87
83
|
handler: WikiChannel.syncProgress,
|
|
@@ -108,10 +104,8 @@ try {
|
|
|
108
104
|
remoteUrl,
|
|
109
105
|
userInfo: { ...defaultGitInfo, ...userInfo },
|
|
110
106
|
logger: {
|
|
111
|
-
log: (message: string, context: ILoggerContext): unknown =>
|
|
112
|
-
|
|
113
|
-
warn: (message: string, context: ILoggerContext): unknown =>
|
|
114
|
-
logger.warn(message, { callerFunction: 'clone', ...context }),
|
|
107
|
+
log: (message: string, context: ILoggerContext): unknown => logger.info(message, { callerFunction: 'clone', ...context }),
|
|
108
|
+
warn: (message: string, context: ILoggerContext): unknown => logger.warn(message, { callerFunction: 'clone', ...context }),
|
|
115
109
|
info: (message: GitStep, context: ILoggerContext): void => {
|
|
116
110
|
logger.notice(this.translateMessage(message), {
|
|
117
111
|
handler: WikiChannel.syncProgress,
|
package/dist/src/clone.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../src/clone.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAI3E,OAAO,EAAW,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../src/clone.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAI3E,OAAO,EAAW,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG9D,wBAAsB,KAAK,CAAC,OAAO,EAAE;IACnC,2GAA2G;IAC3G,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC9C,2EAA2E;IAC3E,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDhB"}
|
package/dist/src/clone.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { exec } from 'dugite';
|
|
2
2
|
import { truncate } from 'lodash';
|
|
3
3
|
import { credentialOff, credentialOn } from './credential';
|
|
4
4
|
import { defaultGitInfo as defaultDefaultGitInfo } from './defaultGitInfo';
|
|
@@ -6,6 +6,7 @@ import { GitPullPushError, SyncParameterMissingError } from './errors';
|
|
|
6
6
|
import { initGitWithBranch } from './init';
|
|
7
7
|
import { getRemoteName } from './inspect';
|
|
8
8
|
import { GitStep } from './interface';
|
|
9
|
+
import { toGitStringResult } from './utils';
|
|
9
10
|
export async function clone(options) {
|
|
10
11
|
const { dir, remoteUrl, userInfo, logger, defaultGitInfo = defaultDefaultGitInfo } = options;
|
|
11
12
|
const { gitUserName, branch } = userInfo ?? defaultGitInfo;
|
|
@@ -44,7 +45,7 @@ export async function clone(options) {
|
|
|
44
45
|
await credentialOn(dir, remoteUrl, gitUserName, accessToken, remoteName);
|
|
45
46
|
try {
|
|
46
47
|
logProgress(GitStep.StartFetchingFromGithubRemote);
|
|
47
|
-
const { stderr: pullStdError, exitCode } = await
|
|
48
|
+
const { stderr: pullStdError, exitCode } = toGitStringResult(await exec(['pull', remoteName, `${branch}:${branch}`], dir));
|
|
48
49
|
if (exitCode === 0) {
|
|
49
50
|
logProgress(GitStep.SynchronizationFinish);
|
|
50
51
|
}
|
package/dist/src/clone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAA0B,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAU3B;IACC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC;IAC7F,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,QAAQ,IAAI,cAAc,CAAC;IAC3D,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,IAAI,EAAE,CAAC;IAEvC,IAAI,WAAW,KAAK,EAAE,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QACpD,MAAM,IAAI,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,yBAAyB,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,IAAa,EAAW,EAAE,CAC7C,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE;QACjB,YAAY,EAAE,OAAO;QACrB,IAAI;QACJ,GAAG;QACH,SAAS;KACV,CAAC,CAAC;IACL,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,IAAa,EAAW,EAAE,CAC3D,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE;QACrB,YAAY,EAAE,OAAO;QACrB,IAAI;QACJ,GAAG;QACH,SAAS;KACV,CAAC,CAAC;IAEL,WAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE5C,QAAQ,CACN,IAAI,CAAC,SAAS,CAAC;QACb,SAAS;QACT,WAAW;QACX,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE;YACjC,MAAM,EAAE,EAAE;SACX,CAAC;KACH,CAAC,EACF,OAAO,CAAC,sBAAsB,CAC/B,CAAC;IACF,QAAQ,CAAC,qCAAqC,GAAG,EAAE,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACrF,MAAM,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACpD,QAAQ,CAAC,kDAAkD,GAAG,EAAE,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAClG,WAAW,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;IAC5D,MAAM,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACzE,IAAI,CAAC;QACH,WAAW,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;QACnD,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3H,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,WAAW,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commitAndSync.d.ts","sourceRoot":"","sources":["../../src/commitAndSync.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"commitAndSync.d.ts","sourceRoot":"","sources":["../../src/commitAndSync.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI9D,MAAM,WAAW,qBAAqB;IACpC,yBAAyB;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,2GAA2G;IAC3G,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC9C,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,+GAA+G;IAC/G,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AACD;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgKjF;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IAChD,gDAAgD;IAChD,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;IACvD,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;IACzC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,iBAcA"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { exec } from 'dugite';
|
|
2
2
|
import { credentialOff, credentialOn } from './credential';
|
|
3
3
|
import { defaultGitInfo as defaultDefaultGitInfo } from './defaultGitInfo';
|
|
4
4
|
import { CantSyncGitNotInitializedError, GitPullPushError, SyncParameterMissingError } from './errors';
|
|
5
5
|
import { assumeSync, getDefaultBranchName, getGitRepositoryState, getRemoteName, getSyncState, haveLocalChanges } from './inspect';
|
|
6
6
|
import { GitStep } from './interface';
|
|
7
7
|
import { commitFiles, continueRebase, fetchRemote, mergeUpstream, pushUpstream } from './sync';
|
|
8
|
+
import { toGitStringResult } from './utils';
|
|
8
9
|
/**
|
|
9
10
|
* `git add .` + `git commit` + `git rebase` or something that can sync bi-directional
|
|
10
11
|
*/
|
|
@@ -99,7 +100,9 @@ export async function commitAndSync(options) {
|
|
|
99
100
|
}
|
|
100
101
|
case 'diverged': {
|
|
101
102
|
logProgress(GitStep.LocalStateDivergeRebase);
|
|
102
|
-
|
|
103
|
+
const rebaseResult = toGitStringResult(await exec(['rebase', `${remoteName}/${defaultBranchName}`], dir));
|
|
104
|
+
exitCode = rebaseResult.exitCode;
|
|
105
|
+
stderr = rebaseResult.stderr;
|
|
103
106
|
logProgress(GitStep.RebaseResultChecking);
|
|
104
107
|
if (exitCode !== 0) {
|
|
105
108
|
logWarn(`exitCode: ${exitCode}, stderr of git rebase: ${stderr}`, GitStep.RebaseResultChecking);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commitAndSync.js","sourceRoot":"","sources":["../../src/commitAndSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commitAndSync.js","sourceRoot":"","sources":["../../src/commitAndSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.d.ts","sourceRoot":"","sources":["../../src/credential.ts"],"names":[],"mappings":"AAIA,oBAAY,WAAW;IACrB,MAAM,WAAW;CAClB;AAGD,eAAO,MAAM,0BAA0B,
|
|
1
|
+
{"version":3,"file":"credential.d.ts","sourceRoot":"","sources":["../../src/credential.ts"],"names":[],"mappings":"AAIA,oBAAY,WAAW;IACrB,MAAM,WAAW;CAClB;AAGD,eAAO,MAAM,0BAA0B,GAAI,QAAQ,MAAM,EAAE,UAAU,MAAM,EAAE,aAAa,MAAM,KAAG,MACiB,CAAC;AAGrH;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,WAAW,cAAqB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAUf;AACD;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,cAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAU9I"}
|
package/dist/src/credential.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { exec } from 'dugite';
|
|
2
2
|
import { trim } from 'lodash';
|
|
3
3
|
import { getRemoteUrl } from './inspect';
|
|
4
4
|
export var ServiceType;
|
|
@@ -22,8 +22,8 @@ export async function credentialOn(directory, remoteUrl, userName, accessToken,
|
|
|
22
22
|
break;
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
await
|
|
26
|
-
await
|
|
25
|
+
await exec(['remote', 'add', remoteName, gitUrlWithCredential], directory);
|
|
26
|
+
await exec(['remote', 'set-url', remoteName, gitUrlWithCredential], directory);
|
|
27
27
|
}
|
|
28
28
|
/**
|
|
29
29
|
* Add remote without credential
|
|
@@ -40,6 +40,6 @@ export async function credentialOff(directory, remoteName, remoteUrl, serviceTyp
|
|
|
40
40
|
break;
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
await
|
|
43
|
+
await exec(['remote', 'set-url', remoteName, gitUrlWithOutCredential], directory);
|
|
44
44
|
}
|
|
45
45
|
//# sourceMappingURL=credential.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.js","sourceRoot":"","sources":["../../src/credential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"credential.js","sourceRoot":"","sources":["../../src/credential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,CAAN,IAAY,WAEX;AAFD,WAAY,WAAW;IACrB,gCAAiB,CAAA;AACnB,CAAC,EAFW,WAAW,KAAX,WAAW,QAEtB;AAED,oJAAoJ;AACpJ,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAAc,EAAE,QAAgB,EAAE,WAAmB,EAAU,EAAE,CAC1G,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,QAAQ,IAAI,WAAW,cAAc,CAAC,CAAC,CAAC;AACrH,MAAM,6BAA6B,GAAG,CAAC,iBAAyB,EAAU,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;AAEhI;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,SAAiB,EACjB,SAAiB,EACjB,QAAgB,EAChB,WAAmB,EACnB,UAAkB,EAClB,WAAW,GAAG,WAAW,CAAC,MAAM;IAEhC,IAAI,oBAAoB,CAAC;IACzB,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YACxB,oBAAoB,GAAG,0BAA0B,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YACpF,MAAM;QACR,CAAC;IACH,CAAC;IACD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IAC3E,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;AACjF,CAAC;AACD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,UAAkB,EAAE,SAAkB,EAAE,WAAW,GAAG,WAAW,CAAC,MAAM;IAC7H,MAAM,UAAU,GAAG,SAAS,IAAI,CAAC,MAAM,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5E,IAAI,uBAAuB,CAAC;IAC5B,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YACxB,uBAAuB,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;YACpE,MAAM;QACR,CAAC;IACH,CAAC;IACD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,uBAAuB,CAAC,EAAE,SAAS,CAAC,CAAC;AACpF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forcePull.d.ts","sourceRoot":"","sources":["../../src/forcePull.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAW,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"forcePull.d.ts","sourceRoot":"","sources":["../../src/forcePull.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAW,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI9D,MAAM,WAAW,iBAAiB;IAChC,2GAA2G;IAC3G,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;IAC9C,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,iBAAiB,iBAkEzD;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAK3F"}
|
package/dist/src/forcePull.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { exec } from 'dugite';
|
|
2
2
|
import { syncPreflightCheck } from './commitAndSync';
|
|
3
3
|
import { credentialOff, credentialOn } from './credential';
|
|
4
4
|
import { defaultGitInfo as defaultDefaultGitInfo } from './defaultGitInfo';
|
|
@@ -6,6 +6,7 @@ import { CantForcePullError, SyncParameterMissingError } from './errors';
|
|
|
6
6
|
import { getDefaultBranchName, getRemoteName, getSyncState } from './inspect';
|
|
7
7
|
import { GitStep } from './interface';
|
|
8
8
|
import { fetchRemote } from './sync';
|
|
9
|
+
import { toGitStringResult } from './utils';
|
|
9
10
|
/**
|
|
10
11
|
* Ignore all local changes, force reset local to remote.
|
|
11
12
|
* This is usually used in readonly blog, that will fetch content from a remote repo. And you can push content to the remote repo, let the blog update.
|
|
@@ -79,7 +80,7 @@ export async function forcePull(options) {
|
|
|
79
80
|
* Internal method used by forcePull, does the `reset --hard`.
|
|
80
81
|
*/
|
|
81
82
|
export async function hardResetLocalToRemote(dir, branch, remoteName) {
|
|
82
|
-
const { exitCode, stderr } = await
|
|
83
|
+
const { exitCode, stderr } = toGitStringResult(await exec(['reset', '--hard', `${remoteName}/${branch}`], dir));
|
|
83
84
|
if (exitCode !== 0) {
|
|
84
85
|
throw new CantForcePullError(`${remoteName}/${branch} ${stderr}`);
|
|
85
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forcePull.js","sourceRoot":"","sources":["../../src/forcePull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"forcePull.js","sourceRoot":"","sources":["../../src/forcePull.ts"],"names":[],"mappings":"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"}
|
package/dist/src/init.d.ts
CHANGED
|
@@ -9,8 +9,8 @@ export interface IGitInitOptions {
|
|
|
9
9
|
* Following techniques are not working:
|
|
10
10
|
*
|
|
11
11
|
* ```js
|
|
12
|
-
* await
|
|
13
|
-
* await
|
|
12
|
+
* await exec(['symbolic-ref', 'HEAD', `refs/heads/${branch}`], dir);
|
|
13
|
+
* await exec(['checkout', `-b`, branch], dir);
|
|
14
14
|
* ```
|
|
15
15
|
*
|
|
16
16
|
* This works:
|
package/dist/src/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;;;;;;;;;;OAYG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,SAAwB,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAY7H"}
|
package/dist/src/init.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
+
import { exec } from 'dugite';
|
|
1
2
|
import fs from 'fs-extra';
|
|
2
3
|
import path from 'path';
|
|
3
|
-
/* eslint-disable unicorn/prevent-abbreviations */
|
|
4
|
-
import { GitProcess } from 'dugite';
|
|
5
4
|
import { defaultGitInfo } from './defaultGitInfo';
|
|
6
5
|
/**
|
|
7
6
|
* Init and immediately checkout the branch, other wise the branch will be HEAD, which is annoying in the later steps
|
|
@@ -10,13 +9,13 @@ export async function initGitWithBranch(dir, branch = defaultGitInfo.branch, opt
|
|
|
10
9
|
if (options?.bare === true) {
|
|
11
10
|
const bareGitPath = path.join(dir, '.git');
|
|
12
11
|
await fs.mkdirp(bareGitPath);
|
|
13
|
-
await
|
|
12
|
+
await exec(['init', `--initial-branch=${branch}`, '--bare'], bareGitPath);
|
|
14
13
|
}
|
|
15
14
|
else {
|
|
16
|
-
await
|
|
15
|
+
await exec(['init', `--initial-branch=${branch}`], dir);
|
|
17
16
|
}
|
|
18
17
|
if (options?.initialCommit !== false) {
|
|
19
|
-
await
|
|
18
|
+
await exec(['commit', `--allow-empty`, '-n', '-m', 'Initial commit when init a new git.'], dir);
|
|
20
19
|
}
|
|
21
20
|
}
|
|
22
21
|
//# sourceMappingURL=init.js.map
|
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,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,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,IAAI,CAAC,CAAC,MAAM,EAAE,oBAAoB,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,CAAC,CAAC,MAAM,EAAE,oBAAoB,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,OAAO,EAAE,aAAa,KAAK,KAAK,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,qCAAqC,CAAC,EAAE,GAAG,CAAC,CAAC;IAClG,CAAC;AACH,CAAC"}
|
package/dist/src/inspect.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export declare function getModifiedFileList(wikiFolderPath: string): Promise<Mod
|
|
|
16
16
|
* @example ```ts
|
|
17
17
|
const githubRepoUrl = await getRemoteUrl(directory);
|
|
18
18
|
const gitUrlWithOutCredential = getGitUrlWithOutCredential(githubRepoUrl);
|
|
19
|
-
await
|
|
19
|
+
await exec(['remote', 'set-url', 'origin', gitUrlWithOutCredential], directory);
|
|
20
20
|
```
|
|
21
21
|
*/
|
|
22
22
|
export declare function getRemoteUrl(dir: string, remoteName: string): Promise<string>;
|
|
@@ -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":"AAOA,OAAO,EAAW,OAAO,EAAE,MAAM,aAAa,CAAC;AAM/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;;;;;;;;;GASG;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;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO/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,CA2DrG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBpF;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,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
/* eslint-disable unicorn/prevent-abbreviations */
|
|
3
|
-
import { GitProcess } from 'dugite';
|
|
1
|
+
import { exec } from 'dugite';
|
|
4
2
|
import fs from 'fs-extra';
|
|
5
3
|
import { listRemotes } from 'isomorphic-git';
|
|
6
4
|
import { compact } from 'lodash';
|
|
@@ -8,6 +6,7 @@ import path from 'path';
|
|
|
8
6
|
import url from 'url';
|
|
9
7
|
import { AssumeSyncError, CantSyncGitNotInitializedError } from './errors';
|
|
10
8
|
import { GitStep } from './interface';
|
|
9
|
+
import { toGitStringResult } from './utils';
|
|
11
10
|
const gitEscapeToEncodedUri = (str) => str.replaceAll(/\\(\d{3})/g, (_, $1) => `%${Number.parseInt($1, 8).toString(16)}`);
|
|
12
11
|
const decodeGitEscape = (rawString) => decodeURIComponent(gitEscapeToEncodedUri(rawString));
|
|
13
12
|
/**
|
|
@@ -15,7 +14,7 @@ const decodeGitEscape = (rawString) => decodeURIComponent(gitEscapeToEncodedUri(
|
|
|
15
14
|
* @param {string} wikiFolderPath location to scan git modify state
|
|
16
15
|
*/
|
|
17
16
|
export async function getModifiedFileList(wikiFolderPath) {
|
|
18
|
-
const { stdout } = await
|
|
17
|
+
const { stdout } = toGitStringResult(await exec(['status', '--porcelain'], wikiFolderPath));
|
|
19
18
|
const stdoutLines = stdout.split('\n');
|
|
20
19
|
const nonEmptyLines = compact(stdoutLines);
|
|
21
20
|
const statusMatrixLines = compact(nonEmptyLines.map((line) => /^\s?(\?\?|[ACMR]|[ACMR][DM])\s?(\S+.*\S+)$/.exec(line))).filter(([_, type, fileRelativePath]) => type !== undefined && fileRelativePath !== undefined);
|
|
@@ -56,7 +55,7 @@ export async function getModifiedFileList(wikiFolderPath) {
|
|
|
56
55
|
* @example ```ts
|
|
57
56
|
const githubRepoUrl = await getRemoteUrl(directory);
|
|
58
57
|
const gitUrlWithOutCredential = getGitUrlWithOutCredential(githubRepoUrl);
|
|
59
|
-
await
|
|
58
|
+
await exec(['remote', 'set-url', 'origin', gitUrlWithOutCredential], directory);
|
|
60
59
|
```
|
|
61
60
|
*/
|
|
62
61
|
export async function getRemoteUrl(dir, remoteName) {
|
|
@@ -92,10 +91,12 @@ if (await haveLocalChanges(dir)) {
|
|
|
92
91
|
```
|
|
93
92
|
*/
|
|
94
93
|
export async function haveLocalChanges(wikiFolderPath) {
|
|
95
|
-
const { stdout } = await
|
|
94
|
+
const { stdout } = toGitStringResult(await exec(['status', '--porcelain'], wikiFolderPath));
|
|
96
95
|
const matchResult = stdout.match(/^(\?\?|[ACMR] |[ ACMR][DM])*/gm);
|
|
97
|
-
|
|
98
|
-
|
|
96
|
+
if (!matchResult) {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
return matchResult.some((entry) => Boolean(entry));
|
|
99
100
|
}
|
|
100
101
|
/**
|
|
101
102
|
* Get "master" or "main" from git repo
|
|
@@ -105,7 +106,7 @@ export async function haveLocalChanges(wikiFolderPath) {
|
|
|
105
106
|
*/
|
|
106
107
|
export async function getDefaultBranchName(wikiFolderPath) {
|
|
107
108
|
try {
|
|
108
|
-
const { stdout } = await
|
|
109
|
+
const { stdout } = toGitStringResult(await exec(['rev-parse', '--abbrev-ref', 'HEAD'], wikiFolderPath));
|
|
109
110
|
const [branchName] = stdout.split('\n');
|
|
110
111
|
// don't return empty string, so we can use ?? syntax
|
|
111
112
|
if (branchName === '') {
|
|
@@ -136,7 +137,7 @@ export async function getSyncState(dir, defaultBranchName, remoteName, logger) {
|
|
|
136
137
|
logProgress(GitStep.CheckingLocalSyncState);
|
|
137
138
|
remoteName = remoteName ?? (await getRemoteName(dir, defaultBranchName));
|
|
138
139
|
const gitArgs = ['rev-list', '--count', '--left-right', `${remoteName}/${defaultBranchName}...HEAD`];
|
|
139
|
-
const { stdout, stderr } = await
|
|
140
|
+
const { stdout, stderr } = toGitStringResult(await exec(gitArgs, dir));
|
|
140
141
|
logDebug(`Checking sync state with upstream, command: \`git ${gitArgs.join(' ')}\` , stdout:\n${stdout}\n(stdout end)`, GitStep.CheckingLocalSyncState);
|
|
141
142
|
if (stderr.length > 0) {
|
|
142
143
|
logDebug(`Have problem checking sync state with upstream,stderr:\n${stderr}\n(stderr end)`, GitStep.CheckingLocalSyncState);
|
|
@@ -185,22 +186,27 @@ export async function getGitRepositoryState(wikiFolderPath, logger) {
|
|
|
185
186
|
return 'NOGIT';
|
|
186
187
|
}
|
|
187
188
|
const gitDirectory = await getGitDirectory(wikiFolderPath, logger);
|
|
189
|
+
const statExists = async (segments, method) => {
|
|
190
|
+
try {
|
|
191
|
+
const stats = await fs.lstat(path.join(gitDirectory, ...segments));
|
|
192
|
+
if (method === 'isFile') {
|
|
193
|
+
return stats.isFile();
|
|
194
|
+
}
|
|
195
|
+
return stats.isDirectory();
|
|
196
|
+
}
|
|
197
|
+
catch {
|
|
198
|
+
return false;
|
|
199
|
+
}
|
|
200
|
+
};
|
|
188
201
|
const [isRebaseI, isRebaseM, isAMRebase, isMerging, isCherryPicking, isBisecting] = await Promise.all([
|
|
189
|
-
|
|
190
|
-
(
|
|
191
|
-
|
|
192
|
-
(
|
|
193
|
-
|
|
194
|
-
(
|
|
195
|
-
// isMerging
|
|
196
|
-
(await fs.lstat(path.join(gitDirectory, 'MERGE_HEAD')).catch(() => ({})))?.isFile?.(),
|
|
197
|
-
// isCherryPicking
|
|
198
|
-
(await fs.lstat(path.join(gitDirectory, 'CHERRY_PICK_HEAD')).catch(() => ({})))?.isFile?.(),
|
|
199
|
-
// isBisecting
|
|
200
|
-
(await fs.lstat(path.join(gitDirectory, 'BISECT_LOG')).catch(() => ({})))?.isFile?.(),
|
|
202
|
+
statExists(['rebase-merge', 'interactive'], 'isFile'),
|
|
203
|
+
statExists(['rebase-merge'], 'isDirectory'),
|
|
204
|
+
statExists(['rebase-apply'], 'isDirectory'),
|
|
205
|
+
statExists(['MERGE_HEAD'], 'isFile'),
|
|
206
|
+
statExists(['CHERRY_PICK_HEAD'], 'isFile'),
|
|
207
|
+
statExists(['BISECT_LOG'], 'isFile'),
|
|
201
208
|
]);
|
|
202
209
|
let result = '';
|
|
203
|
-
/* eslint-disable @typescript-eslint/strict-boolean-expressions */
|
|
204
210
|
if (isRebaseI) {
|
|
205
211
|
result += 'REBASE-i';
|
|
206
212
|
}
|
|
@@ -221,9 +227,10 @@ export async function getGitRepositoryState(wikiFolderPath, logger) {
|
|
|
221
227
|
result += 'BISECTING';
|
|
222
228
|
}
|
|
223
229
|
}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
230
|
+
const isBareResult = toGitStringResult(await exec(['rev-parse', '--is-bare-repository', wikiFolderPath], wikiFolderPath));
|
|
231
|
+
result += isBareResult.stdout.startsWith('true') ? '|BARE' : '';
|
|
232
|
+
/* if ((await exec(['rev-parse', '--is-inside-work-tree', wikiFolderPath], wikiFolderPath)).stdout.startsWith('true')) {
|
|
233
|
+
const { exitCode } = await exec(['diff', '--no-ext-diff', '--quiet', '--exit-code'], wikiFolderPath);
|
|
227
234
|
// 1 if there were differences and 0 means no differences.
|
|
228
235
|
if (exitCode !== 0) {
|
|
229
236
|
result += '|DIRTY';
|
|
@@ -247,14 +254,16 @@ export async function getGitDirectory(dir, logger) {
|
|
|
247
254
|
dir,
|
|
248
255
|
});
|
|
249
256
|
logProgress(GitStep.CheckingLocalGitRepoSanity);
|
|
250
|
-
const { stdout, stderr } = await
|
|
251
|
-
if (
|
|
257
|
+
const { stdout, stderr } = toGitStringResult(await exec(['rev-parse', '--is-inside-work-tree', dir], dir));
|
|
258
|
+
if (stderr.length > 0) {
|
|
252
259
|
logDebug(stderr, GitStep.CheckingLocalGitRepoSanity);
|
|
253
260
|
throw new CantSyncGitNotInitializedError(dir);
|
|
254
261
|
}
|
|
255
262
|
if (stdout.startsWith('true')) {
|
|
256
|
-
const
|
|
257
|
-
const
|
|
263
|
+
const gitDirResult = toGitStringResult(await exec(['rev-parse', '--git-dir', dir], dir));
|
|
264
|
+
const gitPathParts = compact(gitDirResult.stdout.split('\n'));
|
|
265
|
+
const gitPath2 = gitPathParts[0];
|
|
266
|
+
const gitPath1 = gitPathParts[1];
|
|
258
267
|
if (gitPath2 !== undefined && gitPath1 !== undefined) {
|
|
259
268
|
return path.resolve(gitPath1, gitPath2);
|
|
260
269
|
}
|
|
@@ -287,15 +296,15 @@ export async function hasGit(dir, strict = true) {
|
|
|
287
296
|
* https://github.com/simonthum/git-sync/blob/31cc140df2751e09fae2941054d5b61c34e8b649/git-sync#L238-L257
|
|
288
297
|
*/
|
|
289
298
|
export async function getRemoteName(dir, branch) {
|
|
290
|
-
let { stdout } = await
|
|
299
|
+
let { stdout } = toGitStringResult(await exec(['config', '--get', `branch.${branch}.pushRemote`], dir));
|
|
291
300
|
if (stdout.trim()) {
|
|
292
301
|
return stdout.trim();
|
|
293
302
|
}
|
|
294
|
-
({ stdout } = await
|
|
303
|
+
({ stdout } = toGitStringResult(await exec(['config', '--get', `remote.pushDefault`], dir)));
|
|
295
304
|
if (stdout.trim()) {
|
|
296
305
|
return stdout.trim();
|
|
297
306
|
}
|
|
298
|
-
({ stdout } = await
|
|
307
|
+
({ stdout } = toGitStringResult(await exec(['config', '--get', `branch.${branch}.remote`], dir)));
|
|
299
308
|
if (stdout.trim()) {
|
|
300
309
|
return stdout.trim();
|
|
301
310
|
}
|
package/dist/src/inspect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/inspect.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/inspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,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,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,
|
|
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,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,WAI5B,CAAC"}
|
package/dist/src/interface.js
CHANGED
|
@@ -62,11 +62,8 @@ export var GitStep;
|
|
|
62
62
|
</code></pre>
|
|
63
63
|
*/
|
|
64
64
|
export const stepsAboutChange = [
|
|
65
|
-
GitStep.
|
|
66
|
-
GitStep.FetchingData,
|
|
67
|
-
GitStep.LocalStateBehindSync,
|
|
65
|
+
GitStep.GitMergeComplete,
|
|
68
66
|
GitStep.RebaseSucceed,
|
|
69
|
-
GitStep.LocalStateDivergeRebase,
|
|
70
67
|
GitStep.FinishForcePull,
|
|
71
68
|
];
|
|
72
69
|
//# sourceMappingURL=interface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAN,IAAY,OAuCX;AAvCD,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,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,EAvCW,OAAO,KAAP,OAAO,QAuClB;AACD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAiCA,MAAM,CAAN,IAAY,OAuCX;AAvCD,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,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,EAvCW,OAAO,KAAP,OAAO,QAuClB;AACD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,eAAe;CACxB,CAAC"}
|
package/dist/src/sync.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type IGitStringResult } from 'dugite';
|
|
2
2
|
import { IGitUserInfos, IGitUserInfosWithoutToken, ILogger } from './interface';
|
|
3
3
|
/**
|
|
4
4
|
* Git add and commit all file
|
|
@@ -7,7 +7,7 @@ import { IGitUserInfos, IGitUserInfosWithoutToken, ILogger } from './interface';
|
|
|
7
7
|
* @param email
|
|
8
8
|
* @param message
|
|
9
9
|
*/
|
|
10
|
-
export declare function commitFiles(dir: string, username: string, email: string, message?: string, filesToIgnore?: string[], logger?: ILogger): Promise<
|
|
10
|
+
export declare function commitFiles(dir: string, username: string, email: string, message?: string, filesToIgnore?: string[], logger?: ILogger): Promise<IGitStringResult>;
|
|
11
11
|
/**
|
|
12
12
|
* Git push -f origin master
|
|
13
13
|
* This does force push, to deal with `--allow-unrelated-histories` case
|
|
@@ -16,7 +16,7 @@ export declare function commitFiles(dir: string, username: string, email: string
|
|
|
16
16
|
* @param email
|
|
17
17
|
* @param message
|
|
18
18
|
*/
|
|
19
|
-
export declare function pushUpstream(dir: string, branch: string, remoteName: string, userInfo?: IGitUserInfos | IGitUserInfosWithoutToken
|
|
19
|
+
export declare function pushUpstream(dir: string, branch: string, remoteName: string, userInfo?: IGitUserInfos | IGitUserInfosWithoutToken, logger?: ILogger): Promise<IGitStringResult>;
|
|
20
20
|
/**
|
|
21
21
|
* Git merge origin master
|
|
22
22
|
* @param dir
|
|
@@ -24,7 +24,7 @@ export declare function pushUpstream(dir: string, branch: string, remoteName: st
|
|
|
24
24
|
* @param email
|
|
25
25
|
* @param message
|
|
26
26
|
*/
|
|
27
|
-
export declare function mergeUpstream(dir: string, branch: string, remoteName: string, userInfo?: IGitUserInfos | IGitUserInfosWithoutToken
|
|
27
|
+
export declare function mergeUpstream(dir: string, branch: string, remoteName: string, userInfo?: IGitUserInfos | IGitUserInfosWithoutToken, logger?: ILogger): Promise<IGitStringResult>;
|
|
28
28
|
/**
|
|
29
29
|
* try to continue rebase, simply adding and committing all things, leave them to user to resolve in the TiddlyWiki later.
|
|
30
30
|
* @param dir
|
package/dist/src/sync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAMrD,OAAO,EAAW,aAAa,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGzF;;;;;;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,gBAAgB,CAAC,CAuB3B;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,aAAa,GAAG,yBAAyB,EACpD,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,gBAAgB,CAAC,CAgB3B;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,aAAa,GAAG,yBAAyB,EACpD,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,gBAAgB,CAAC,CAe3B;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,10 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
import { GitProcess } from 'dugite';
|
|
1
|
+
import { exec } from 'dugite';
|
|
3
2
|
import fs from 'fs-extra';
|
|
4
3
|
import { listFiles, remove } from 'isomorphic-git';
|
|
5
4
|
import { CantSyncInSpecialGitStateAutoFixFailed, GitPullPushError, SyncScriptIsInDeadLoopError } from './errors';
|
|
6
5
|
import { getGitRepositoryState } from './inspect';
|
|
7
6
|
import { GitStep } from './interface';
|
|
7
|
+
import { toGitStringResult } from './utils';
|
|
8
8
|
/**
|
|
9
9
|
* Git add and commit all file
|
|
10
10
|
* @param dir
|
|
@@ -19,7 +19,7 @@ export async function commitFiles(dir, username, email, message = 'Commit with G
|
|
|
19
19
|
dir,
|
|
20
20
|
});
|
|
21
21
|
logProgress(GitStep.AddingFiles);
|
|
22
|
-
await
|
|
22
|
+
await exec(['add', '.'], dir);
|
|
23
23
|
// find and unStage files that are in the ignore list
|
|
24
24
|
const stagedFiles = await listFiles({ fs, dir });
|
|
25
25
|
if (filesToIgnore.length > 0) {
|
|
@@ -31,7 +31,7 @@ export async function commitFiles(dir, username, email, message = 'Commit with G
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
logProgress(GitStep.AddComplete);
|
|
34
|
-
return await
|
|
34
|
+
return toGitStringResult(await exec(['commit', '-m', message, `--author="${username} <${email}>"`], dir));
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Git push -f origin master
|
|
@@ -50,7 +50,7 @@ export async function pushUpstream(dir, branch, remoteName, userInfo, logger) {
|
|
|
50
50
|
/** when push to remote, we need to specify the local branch name and remote branch name */
|
|
51
51
|
const branchMapping = `${branch}:${branch}`;
|
|
52
52
|
logProgress(GitStep.GitPush);
|
|
53
|
-
const pushResult = await
|
|
53
|
+
const pushResult = toGitStringResult(await exec(['push', remoteName, branchMapping], dir));
|
|
54
54
|
logProgress(GitStep.GitPushComplete);
|
|
55
55
|
if (pushResult.exitCode !== 0) {
|
|
56
56
|
throw new GitPullPushError({ dir, branch, remote: remoteName, userInfo }, pushResult.stdout + pushResult.stderr);
|
|
@@ -71,7 +71,7 @@ export async function mergeUpstream(dir, branch, remoteName, userInfo, logger) {
|
|
|
71
71
|
dir,
|
|
72
72
|
});
|
|
73
73
|
logProgress(GitStep.GitMerge);
|
|
74
|
-
const mergeResult = await
|
|
74
|
+
const mergeResult = toGitStringResult(await exec(['merge', '--ff', '--ff-only', `${remoteName}/${branch}`], dir));
|
|
75
75
|
logProgress(GitStep.GitMergeComplete);
|
|
76
76
|
if (mergeResult.exitCode !== 0) {
|
|
77
77
|
throw new GitPullPushError({ dir, branch, remote: remoteName, userInfo }, mergeResult.stdout + mergeResult.stderr);
|
|
@@ -103,7 +103,7 @@ export async function continueRebase(dir, username, email, logger, providedRepos
|
|
|
103
103
|
throw new SyncScriptIsInDeadLoopError();
|
|
104
104
|
}
|
|
105
105
|
const { exitCode: commitExitCode, stderr: commitStdError } = await commitFiles(dir, username, email, 'Conflict files committed with TiddlyGit-Desktop');
|
|
106
|
-
const rebaseContinueResult = await
|
|
106
|
+
const rebaseContinueResult = toGitStringResult(await exec(['rebase', '--continue'], dir));
|
|
107
107
|
// get info for logging
|
|
108
108
|
rebaseContinueExitCode = rebaseContinueResult.exitCode;
|
|
109
109
|
rebaseContinueStdError = rebaseContinueResult.stderr;
|
|
@@ -123,10 +123,10 @@ export async function continueRebase(dir, username, email, logger, providedRepos
|
|
|
123
123
|
*/
|
|
124
124
|
export async function fetchRemote(dir, remoteName, branch) {
|
|
125
125
|
if (branch === undefined) {
|
|
126
|
-
await
|
|
126
|
+
await exec(['fetch', remoteName], dir);
|
|
127
127
|
}
|
|
128
128
|
else {
|
|
129
|
-
await
|
|
129
|
+
await exec(['fetch', remoteName, branch], dir);
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
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,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/sync.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils.d.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import type { IGitResult, IGitStringResult } from 'dugite';
|
|
1
2
|
export declare const getGitUrlWithGitSuffix: (url: string) => string;
|
|
2
3
|
export declare const getGitUrlWithOutGitSuffix: (url: string) => string;
|
|
4
|
+
export declare const toGitOutputString: (value: string | Buffer) => string;
|
|
5
|
+
export declare const toGitStringResult: (result: IGitResult) => IGitStringResult;
|
|
3
6
|
//# sourceMappingURL=utils.d.ts.map
|
package/dist/src/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAE3D,eAAO,MAAM,sBAAsB,GAAI,KAAK,MAAM,KAAG,MAAsB,CAAC;AAC5E,eAAO,MAAM,yBAAyB,GAAI,KAAK,MAAM,KAAG,MAAmC,CAAC;AAE5F,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,GAAG,MAAM,KAAG,MAAsE,CAAC;AAElI,eAAO,MAAM,iBAAiB,GAAI,QAAQ,UAAU,KAAG,gBAIrD,CAAC"}
|
package/dist/src/utils.js
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
export const getGitUrlWithGitSuffix = (url) => `${url}.git`;
|
|
2
2
|
export const getGitUrlWithOutGitSuffix = (url) => url.replace(/\.git$/, '');
|
|
3
|
+
export const toGitOutputString = (value) => (typeof value === 'string' ? value : value.toString('utf8'));
|
|
4
|
+
export const toGitStringResult = (result) => ({
|
|
5
|
+
...result,
|
|
6
|
+
stdout: toGitOutputString(result.stdout),
|
|
7
|
+
stderr: toGitOutputString(result.stderr),
|
|
8
|
+
});
|
|
3
9
|
//# sourceMappingURL=utils.js.map
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC;AAC5E,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAE5F,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAsB,EAAU,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAElI,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAkB,EAAoB,EAAE,CAAC,CAAC;IAC1E,GAAG,MAAM;IACT,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;IACxC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;CACzC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "git-sync-js",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "JS implementation for Git-Sync, a handy script that backup your notes in a git repo to the remote git services.",
|
|
5
5
|
"homepage": "https://github.com/linonetwo/git-sync-js",
|
|
6
6
|
"bugs": {
|
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
"docs": "docs-ts",
|
|
27
27
|
"lint": "eslint --ext ts .",
|
|
28
28
|
"lint:fix": "eslint --ext ts --fix .",
|
|
29
|
+
"check": "tsc --noEmit --skipLibCheck",
|
|
29
30
|
"docs:build": "docusaurus build",
|
|
30
31
|
"docs:dev": "docusaurus start",
|
|
31
32
|
"docs:generate": "npm run docs:generate:api && npm run docs:generate:copy",
|
|
@@ -33,7 +34,7 @@
|
|
|
33
34
|
"docs:generate:copy": "zx scripts/copy-readme.mjs"
|
|
34
35
|
},
|
|
35
36
|
"dependencies": {
|
|
36
|
-
"dugite": "
|
|
37
|
+
"dugite": "3.0.0-rc12",
|
|
37
38
|
"fs-extra": "^11.2.0",
|
|
38
39
|
"isomorphic-git": "^1.25.2",
|
|
39
40
|
"lodash": "^4.17.21"
|